Revert "Revert "Dev""
Merge pull request #5 from chirowong/revert-4-revert-3-dev

Revert "Revert "Dev""