Refactored for 0.2.0
Merge pull request #8 from fortrabbit/refactor-0.2.0

Refactored for 0.2.0