adding changes related to tickets #4 #7 and #36