More readable code, version number fixed, minor improves