Merge pull request #67 from dpradeep/merge-20140827