version 0.2

Changed some behaviour