Merge pull request #2 from phuppe/master

First commit of application