Merge pull request #18 from fractalfrenzy/develop-sean

alpha release 3
Beta 1