Refactoring
More refactoring
Merge branch 'master' of github.com:Tactics/InvoiceLib
[ENHANCE] some more refactoring