Merge remote-tracking branch 'upstream/master'
Merge pull request #186 from adamarla/master

Merge remote-tracking branch 'upstream/master'