Polish + Attempted bug fix
Merge pull request #2 from braddv/jason

Polish + Attempted bug fix