WIP
Executable
Its coming to life
Executable working
Merge branch 'dev'
Merge pull request #2 from paytunia/master

<3