Merge pull request #1 from joa/master

Initial Push
Merge pull request #2 from joa/master

Fix broken module structure
Update README.md

Add TODOs to readme without respect to priority