louisel/chillicrab — pull request #1 by louisel (2013-10-12 10:00:01+00:00)
Title: Merge louise into Master

Merge louise into Master