Merge pull request #20 from mershack/master

Update
.
Merge remote-tracking branch 'upstream/master'