Added const to member functions where possible
#260
Merged
const to member functions where possible
#260