Candid/demo — pull request #1 by Candid (2012-10-04 21:32:59+00:00)
Title: hotfix

please merge this hotfix into master