Merge pull request #64 from rayguard/master

Update Merge
Changes
Merge remote-tracking branch 'upstream/development'