beta 6
Merge pull request #21 from fractalfrenzy/develop-sean

beta 6