.
Merge pull request #20 from mershack/master

Update