Changes 01/07/2014

Changes following tutorial