updated with comments from @cassiedoll for issue #76