Fix issue 34 on Github