Testing functionality with CommandLineInterface
Merge origin/master