Updated version number
Added check for CLI