Updated to new upstream version (Closes #86)