Bug fixes
Merge branch 'master' of GitHub:jlamanna/encounter-extract
More updates