Merge pull request #54 from Mchapuis/master

pull that sheeeit
Merge pull request #55 from Mchapuis/master

A single file!
Merge pull request #56 from Mchapuis/master

f
Look, a modest commit of only TWO files! Aren't I nice? :P

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

jhjh