Working on command prompt
Merge branch 'Feature-2' into Release-1
Merge pull request #8 from SCMEvalDev/Release-1

Synching changes before meeting #2