Changes from bitbucket

Synchronizing changes pushed to Bitbucket.