More stuff for Cecilia
Merge pull request #221 from benjello/dev

More stuff for Cecilia