Updates for Version 3
Merge pull request #41 from shawnjohnson/master

Updates for Version 3