closes #7 - income fixes

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'income' into develop
closes milestone #4 - version 0.0.4

Signed-off-by: Alexander Skjolden <alex@plastboks.net>