added issue 70