Merge branch 'Develop' of https://github.com/gplusnasite/VMF into Develop