new

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
rewrite

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
tests pass

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>
Merge branch 'dev'

* dev:
  tests pass
  rewrite
  new
Merge branch 'master' into dev

* master: