Version changed and minor bug fixing