gryffon/eggofpanku — pull request #27 by gryffon (2014-04-19 20:39:38+00:00)
Title: Merge pull request #18 from gryffon/master

Bring up to date with master