Issue #15 update