copied from interwebs
Merge remote-tracking branch 'origin/master'
Merge pull request #6 from Mvalliere/master

stuff