Update
Merge pull request #57 from mierze/master

Update