merging in changes to parseNotesField from develop branch
Merge branch 'develop'