Merge pull request #32 from pflannery/dev

Extra carousel fixes