fixed #46
ready for checout
clean up