Change pricing scheme (Issue #234) and close issue #201 (extend working
and nonworking days)