Issue 53 commit