Markolie/Paradise — pull request #3 by Markolie (2014-11-14 13:09:29+00:00)
Title: Upstream merge

Upstream merge