Feature/1.2.1

Some bug fix.