Develop

Fixed issue 76

and some cleanup