Merge pull request #48 from Mchapuis/master

I don't know how she puts so many files in here all the time. WTH
Merge pull request #49 from Mchapuis/master

fxjg
Merge pull request #50 from Mchapuis/master

Fifty-one files changed!
Here's some week changes!

Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Merge pull request #39 from mysteriosum/master

te