krico/jas — pull request #27 by krico (2014-11-06 00:51:12+00:00)
Title: Jas 21 interim merge so that work can be done on #25 

interim merge so that work can be done on #25