Refactor
Merge branch 'HeronPC' of https://github.com/Yayego/FinApps2014