Updates for rev 2.2.0, issues 3 and 4 fixed