agrafix Merge pull request #18 from ericbmerritt/fix/various-fixes-and-updates …