Updated files. Relates to #5