Some fixes, new class Currency, issue #12