fixed error, other minor changes
Merge pull request #161 from burke-software/temporary_develop

fixed error, other minor changes