Merge pull request #1 from sprotsman/master

little changes