- Code cleanup;
- Updated CHANGELOG file.
Merge branch 'master' of https://github.com/aarnt/octopi