This commit refs:#1 and closes #1