Merge pull request #100 from xianyi/develop