Merge pull request #14 from sundw2014/master