Changes for issues #32,#33,#36