Updated main,scanner,usercon and removed some comments
Merge pull request #36 from JeroenMathon/Development

Updated main,scanner,usercon and removed some comments