ugh
Merge remote-tracking branch 'upstream/master'
Things
Last second fixes

I hope
Merge pull request #7 from albperez/master

Final update