#45 fixes merge issues
Merge pull request #46 from briefmnews/#45-fixes-PR-#35

#45 fixes merge issues