Merge pull request #56 from rpact-com/dev/4.0.1

Merge pull request #56 from rpact-com/dev/4.0.1 #49