merge feature#38 to single commit