Issue 68 resolved