working copy of model for mac
Merge pull request #2 from christianurich/master

working copy of model for mac