Complete money class
Merge origin/master