3d7fa33 Merge pull request #5 from jsgirls/development