Changes to readme, comments, and a little refactoring.
Merge branch 'dev'
Adds changelog
Merge branch 'master' into dev