Fix breaking changes
Merge pull request #24 from infinityb/master

Fix breaking changes