Merge pull request #219 from dhasenan/master