Merge pull request #13 from ahankinson/master

Fixed: Conflicting return types in the init method