20140319.01 - fixing #178 and some other minor things