Merge pull request #11 from ccd-utexas/master

merging master into develop
Merge pull request #12 from ccd-utexas/develop

Merge pull request #11 from ccd-utexas/master