Fixed the issue for release 1.1
resolved conflict