Merge pull request #240 from Carthage/0.5-development

0.5: Pit of Loneliness
Merge remote-tracking branch 'origin/master' into 0.6-development
Bump version number to 0.6