Hendle more input varieties.
Merge branch 'master' of github.com:simar0at/cs-xsl