olga-jane/prizm — pull request #779 by qlynn (2014-12-29 14:23:04+00:00)
Title: Merge pull request #27 from olga-jane/master

update from origin