Updated files fixes #5 and fixes #6