Merge pull request #1329 from hisakonog/master

Merge pull request #4 from OpenSourceFieldlinguistics/master
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream