Improving command line parse and path getter
Merge branch 'test'