Merge pull request #9 from Kholiway/Trunk

Trunk
Merge pull request #10 from Kholiway/Trunk

3/7
Merge pull request #11 from Kholiway/Trunk

3/13
Merge pull request #4 from Lsargent/Trunk

Trunk