Fix breaking error in init, probably a bad merge
Merge pull request #17 from bazerk/master

Fix breaking error in init, probably a bad merge