Merge pull request #511 from negativeExponent/updates