fixes #74
Merge branch 'master' of https://github.com/ncsu-stars/Stars-CMS