Merge your implementation here @machendos
Merge your implementation here @machendos