beta 5
Merge pull request #20 from fractalfrenzy/develop-sean

beta 5