new update to address Manu comments on fixing #19 @ Thu Dec 12 16:31:18 PST 2013