[bugfix] Update to bugfix master.
Merge pull request #2 from locusf/master

[bugfix] Update to bugfix master.