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

source files modification