Merge pull request #6 from hazah/master

Update from master.
Merge pull request #7 from hazah/permissions

Merge pull request #6 from hazah/master