Fix issue 34 on Github

Fix for the issue 34