Resolves issues #48 #49