Merge remote-tracking branch 'upstream/master'
Merge pull request #78 from Aminopyridin/master

Merge remote-tracking branch 'upstream/master'