Issue 13 May 17

Issue 13 May 17