Revert "Wip"
Merge pull request #5 from kene101/revert-2-wip

Revert "Wip"