Merge pull request #112 from BuddyPlatform/develop

Develop => Master for 2.0.7