Merge pull request #374 from vishwasbabu/develop

cleaning up transfers functionality
minor fixes to transfers functionality