#36 added to features requested