Version 0.2 fixed