fix #107#109

limonrojo-nm wants to merge 2 commits intocoddingtonbear:mastercoddingtonbear/django-measurement:masterfrom

limonrojo-nm:masterlimonrojo-nm/django-measurement:masterCopy head branch name to clipboard