Develop

fixes for issue 55 and 67 - thanks.