Fixes #2, code style and minor refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHANGELOG.md