Merge pull request #392 from DutchRPW/master

Money related stuff