Issue 17 June 14

Issue 17 June 14