Fixing issues #252 and #251.
Merge branch 'release/1.4.0' into develop

* release/1.4.0:
  Fixing issues #252 and #251.