Merge pull request #16 from brint/master

System user setup fix