Commit 3cdae42d6500619f9105134606e722f1fa49c847

stopiccot 2014-04-23T03:42:32

Fixing issues discovered by Philipp Wiesemann