Updated with latest updates from bitbucket