Merge pull request #14 from Lsargent/Trunk

Trunk
4/20
Merge pull request #41 from Kholiway/Trunk

Trunk