Update
Merge pull request #65 from gergo85/master

Update