merged @seanwinn fixes
Merge pull request #12 from bunchc/lolquantum

merged @seanwinn fixes