closes #238
Merge branch 'f238'