Issue 302

https://github.com/ecomfe/edp/issues/302
@otakustay @leeight