Merge pull request #139 from crazymaster/master

OptionParser: Fix spec
Improve spec.sh