Adding scanner fixes
Merge pull request #104 from computmaxer/master

Adding scanner fixes
fix conflicts