Merge pull request #1 from stiers/master

Merging trunk with master
Merge pull request #2 from stiers/trunk

Merge pull request #2 from stiers/master