Updating to version 0.2 with fixes from mrwweb