fixed #16
Merge branch 'master' into macosx