many new features
Merge pull request #9 from nealgranger/nealg

many new features