Merge pull request #2 from stiers/master

Merging trunk with master on version 3.0.6