Closes #2: implemented feature