Merge pull request #111 from theblang/master