File permissions
Merge branch 'master' of github.com:empurium/nimbus