Fixing some stuff
Merge branch 'master' of https://github.com/fuligginoso/finance
Fixed bugs