Fixing some naming issues and casting problems
Merge branch 'master' of github.com:c1phr/transactions