Many imrprovements
Merge pull request #17 from fractalfrenzy/develop-sean

Many imrprovements