Implementing @Robyer proposition (#223)