-#16 passes tests
Merge remote-tracking branch 'origin/dev/16' into stable

* origin/dev/16:
  -#16 passes tests