Adds support for dash, underscore and deleted underscore options.

Fix for issue#4.