Merge pull request #16 from fractalfrenzy/develop-sean

Develop sean
Many imrprovements