Issue 17 June 13

Issue 17 June 13