latest changes; includes fix for issue #2