#104 addressed all CA violations
Merge pull request #139 from adamralph/104

#104 addressed all CA violations