Merge pull request #6 from hazendaz/master

updated spring and stripes