Commit 10:15 21/06/2014

Some stuff