Added versioning and fixed a bug with flavour