Merge pull request #56 from ilendl2/master

Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'