wop
Merged version from bitbucket