reverted change made in prior commit
Merge remote-tracking branch 'upstream/master'
Merge pull request #175 from adamarla/master

Reverted prior change