20140827.01 - fixing #196 and started work on #197