Merge pull request #128 from caseyjhol/master

Fix #69 and other small bugs
Fix issue with option titles
Fix issue with option titles
New features & bug fixes