code analysis
Merge pull request #100 from adamralph/95

code analysis