Merge pull request #2 from anders/master

unix stuff