Related to comment from: https://github.com/platzio/frontend/pull/49
Related to comment from: #49