Merge pull request #1 from ITS-UofIowa/test

Merging branches
Merge branch 'master' into test