Version 1.0

This is the final version after my defence