Merge pull request #34 from Kholiway/Trunk

Trunk