Closes Issue 37

#37