Merge pull request #2 from ninnghazad/master

testing downstream pull
Merge pull request #3 from ninnghazad/trunk

Merge pull request #2 from ninnghazad/master