Merge pull request #157 from alxhub/master

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