Closes #41 thx @alexthemitchell