20130514.01 - fixing #12