refactored for new 0.12 codebase
Merge pull request #9 from cleentfaar/preparing-for-0.12

Merging for 0.12