Updated to version 1.0 as in Thesis