Implemented changes suggested by @WouterJ