Merge pull request #1 from claudius108/master

First commit.