Added as issue #15