Close #25 Close #26 Close #27 Close #28 Close #34 Close #35
Merge pull request #36 from scotthonda/3.0-scott

Close #25 Close #26 Close #27 Close #28 Close #34 Close #35