fixed #6: Refactored parser logic. Removed un-necessary complicated logic.
Merge branch 'feature-6'

fixed #6: Merging updated option parser logic.