Implementation of feature#1

I added the implementation of feature#1.