Merge pull request #7 from alexindigo/master

Made it play nice with 0.11.x