Fixed bugs created by yesterdays bug fix
Merge pull request #20 from mhearne-usgs/master

Fixed bugs created by yesterdays bug fix