Merge pull request #19 from xianyi/develop