Added as issue #16