Merge pull request #21 from jasonchutko/master

Various Fixes