fixes #62 Well... that was easy O_o
Merge branch 'master' into feature-9