Internal improvements
Re-worked scanner
Update version number