Added command prototypes
Merged Branch messed up by Rajat Bansal (Yes, we all know who messed it
up :|)