Fixes #349
Merge branch 'master' of github.com:usf-it-rc/cwa_as