fixed #20. Added also some behaviors.