Version 0.2 - fix major bugs