Merge pull request #1 from anders/master

unix stuff