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

Revert "Revert "Feature/bug fixes""