Drenferalis/Testing — pull request #3 by Drenferalis (2014-05-16 23:09:38+00:00)
Title: Merge

Couple of bug fixes and new content.