Merge pull request #19 from mershack/master

.
.