Merge pull request #11 from Lsargent/Trunk

Trunk
4/4
Merge pull request #34 from Kholiway/Trunk

Trunk
Merge branch 'Trunk' of https://github.com/Lsargent/SdProject into Lsargent-Trunk