All in one version (See readme)
Updated readme