Issue #23 && #24