Version 0.2: Added some stuff