Commit changes 8 June 2014
Clean up