Changed version number
Merge with additional annotations from eric