fixes & Version Bump to 0.2