Added decorators to mark methods and tests
increment version
Moved some code around, added docstrings