Merge pull request #74 from ahirapatel/master