Comment added and Bugfix: option -i has optional argument