Merge pull request #70 from mikeneiderhauser/master

Removed duplicate scan in init handle
Merge remote-tracking branch 'upstream/master'