Merge pull request #2 from aenario/master

various improvements
add permissions