compilable from mac
Merge remote-tracking branch 'origin/master' into issue_1
update doc
Merge pull request #3 from iptux-src/issue_1

Issue 1