fixes and modification 12-15
Merge branch 'master' of https://github.com/erichi/fin