Added check for 0 scan elements.
Merge branch 'master' of https://github.com/d4t4king/flaming-octo-dangerzone
Added TODOs and other minor tweaks