Closes Issue 15