Merge pull request #71 from ktekinay/master

Various
Merge pull request #40 from macoslib/master

Merge changes
Merge branch 'macoslib-master'