several weeks changes
some cleanup
Merge pull request #5 from willgamber/develop

several weeks changes