wendang #2

Closed
pmg8uxern wants to merge 3 commits from develop into master