Update and cleanup
Merge pull request #10 from gergo85/patch-2

Update and cleanup