pull #82 bugfix from Christiaan to master