Merge pull request #19 from Mchapuis/master

Pull request for Travis
Changes from the weekend! Plus after-image, and some other stuff

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

taking your changes, this is written by martine