refactoring started
pathpicker cleanup
minor improvements
Merge pull request #146 from naumovs/php-notices-under-cli

Fix notices in CLI mode
minor improvements
Merge remote-tracking branch 'upstream/master'