fixed #1, fixed #2
Merge branch 'master' of https://github.com/luelher/creditumv3