Patched some bugs + Version update