Merge pull request #13 from wick-ed/master

bugfix: incompatible overridden method + minor cleanup