Merge pull request #90 from Cynede/develop

Working on unix integration