Merge pull request #78 from merchantwarehouse/develop

Merge for cleanup.