minor refactoring: credit and debit markers will be credit and debit resp.
Merge branch 'dev'