Fixes for issues #6, #7, #8 and #14

Fixes for issues #6, #7, #8, #14. Also added an option to strip empty <options>

Thanks to @builtbylane, @cah4a, @mcaskill for helping out (and to everyone else for pointing out the issues)!