Issue #1 solved
Merge branch 'develop' of github/dtdtogv into develop