Merge pull request #4 from JeffreyFalgout/dev

Test branches...
Merge pull request #5 from JeffreyFalgout/dev

undo that test
Merge pull request #6 from JeffreyFalgout/dev

test 2
undo that test
Merge pull request #7 from JeffreyFalgout/master

sync dev to master