Merge pull request #94 from cmoha/master