Merge pull request #49 from claudius108/master

Partial replacement of hardwired permission modes