Merge pull request #69 from DVLGroup/branch-57

Branch 57
[Auto Confirm] 90%