Cleaned a bit, changed namespace, version