1.2

Add Test and fix bug