Merge pull request #11 from ccd-utexas/master

merging master into develop