implemented PR#27