Merge pull request #28 from Kholiway/Trunk

Trunk
Merge pull request #10 from Lsargent/Trunk

Merge pull request #28 from Kholiway/Trunk