This pull requests solves: https://assembly.com/nomad/bounties/37