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

update