closes #44 really
Merge remote-tracking branch 'upstream/master'
Merge pull request #49 from fommil/master

Bugfix