Merge pull request #1 from Jimdo/master

Reintegrate changes from mlafeldt