Merge pull request #215 from tejr/master