Merge pull request #659 from stefanbeller/master

Some code maintanence