Merge pull request #916 from cesine/master

Change list for v1.48
Merge pull request #6 from OpenSourceFieldlinguistics/master

bringing in changes from upstream