Initial working version
Merge pull request #1 from djotto/version_1

Initial working version