Merge pull request #44 from Synchro/master

Fix for #43
Update changelog
Merge remote-tracking branch 'upstream/master'