Merge pull request #33 from Mchapuis/master

Like the third one today or something crazy? lawlz
That's my stuff and I'm sticking to it!

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

stuff