Merge pull request #15 from Lsargent/Trunk

Trunk
4/22 again
Merge pull request #45 from Kholiway/Trunk

Trunk