Build 1.3.0.1, merge fix #200