merge jahway branch into master branch #2

Merged
jahway603 merged 17 commits from jahway into master 3 years ago