Revert #229 and 311d724 for now because it breaks backwards compatibility.
Update Changelog and bumped version.
Merge pull request #251 from trustmaster/master

Hotfix for breaking changes in #229