Bringing up to date.
milestone 5
Merge pull request #9 from fractalfrenzy/sean-develop

Sean develop