Merge pull request #1 from mthomasurm/1.1

1.1
Merge pull request #2 from mthomasurm/master

Merge pull request #1 from mthomasurm/1.1