Many changes
Merge pull request #12 from sb8244/steve3

Many changes