Fixed issue #15.