Removed invalid controller
Made -i option for add suprarser required
Merge branch 'vacation'