Merge pull request #2 from pigoneand/master

Merge with pigoneand's contributions...
Merge remote-tracking branch 'upstream/master'