Merge pull request #1 from rfabbri/master

merging from rfabbri's github
Merge remote-tracking branch 'remotes/uzu/master'

dealing with github stuff...