Merge pull request #35 from Kholiway/Trunk

Trunk
Merge pull request #13 from Lsargent/Trunk

Merge pull request #35 from Kholiway/Trunk