minor
Merge remote-tracking branch 'upstream/master'
issue 35
Merge pull request #43 from dev2geek/master

issue #35