Merge pull request #34 from Kholiway/Trunk

Trunk
Merge pull request #12 from Lsargent/Trunk

Merge pull request #34 from Kholiway/Trunk