Revert "Feature/bug fixes"
Merge pull request #5 from stakes/revert-4-feature/bug-fixes

Revert "Feature/bug fixes"