Version 0.2 - Major bug fixes