Merge pull request #28 from Kholiway/Trunk

Trunk