commit by xfwduke@mac
merge
Merge pull request #1 from xfwduke/master

pull from xfwduke