Added OS name to package and adjusted paths.
Merge pull request #19 from murrekatt/develop

Added OS name to package and adjusted paths.