cleaned up code and added javadoc
Merge branch 'master' of https://github.com/emmwe459/octofy