BOD-1: Update 0.1

Some bugs fix