Build 2.1.2.0 - correction

issue #2
issue #3