Merge pull request #55 from enotodden/master

Allow non-system-wide install