refactored for 0.12 release
Merge pull request #3 from cleentfaar/preparing-0.12

moving to 0.12 codebase