Implemented credit confiscation for demo.
Merge origin/master