Merge pull request #232 from tomaswolf/ticket-88-bugfix

Usability bug fix