Merge pull request #4 from Lsargent/Trunk

Trunk
Merge pull request #8 from Lsargent/Trunk

Trunk
Merge pull request #12 from Lsargent/Trunk

Trunk
Merge pull request #16 from Barton3200/Trunk

Trunk