Addressed feature req #294