olga-jane/prizm — pull request #699 by qlynn (2014-12-20 14:43:42+00:00)
Title: Merge pull request #19 from olga-jane/master

update from origin