fixed merge problem
Merge remote-tracking branch 'upstream/master'
Merge pull request #180 from Ventrella/master

fixed merge issue