Merge pull request #16 from oferrigni/Fixing.MacOS.Issue.13