Implemented a solution for #20