v0.4 - fixed some bugs