Squashed previous commits into 1
resolving ex1 README conflict