Merge pull request #25 from Mchapuis/master

gr
Weekend changes~!

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

changez