stuff :-(
Merge pull request #61 from j4kobbech/cleanup-branch

stuff :-(