testing changes
Merge pull request #1 from ernerock/master

testing changes