version 0.1.4
merged