whoshuu/chimerider — pull request #2 by arolan (2013-12-07 20:18:44+00:00)
Title: Merging Joohee's branch into Andres/Rolan branch

Merging Joohee's branch into Andres/Rolan branch