Some slight changes and testing.
Merge pull request #2 from crotherz/master

Some slight changes and testing.