fixed build on Mac
Merge pull request #19 from gsdlab/develop

Release 0.3.6
Merge branch 'develop'
Merge pull request #20 from gsdlab/develop

Release 0.3.6.1
fixed make lib
merged master, resolved conflicts