This commit closes #4 and #5