[Issue #15]