Change targetSDK to 21
Fix critical error at Commander: split parameters with limit equal 2
Refactoring and comments