Merge pull request #16 from mershack/master

update
Merge pull request #17 from mershack/master

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