Fix for issues/17 in main project repository

Fix for issue 17.