nm to meggy
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.rb
load commands
without ~ files
Fix the subcommands call, and check if the args are passed.
Merge remote-tracking branch 'ta/master'