0.6-test-1

#2 fixed