Revert commit:4a38d8f0 as it leads to permission problems, fixes #309.
Merge pull request #310 from j23d/master

Revert commit:4a38d8f0 as it leads to permission problems, fixes #309.