Some more cleanup
Merge pull request #120 from frankmayer/devel

Some more cleanup