Bugfixes

Fix two bugs:

https://github.com/edx/ease/issues/32 and https://github.com/edx/ease/issues/31 .