Revert "Revert "Issue 3""

This reverts commit 2ec046da85f650bb65b7d354a838401cd06afa39.