.
Merge remote-tracking branch 'upstream/master'
.
.
Merge pull request #24 from mershack/master

.