next progress
Merge branch 'master' of https://github.com/Blue-NET-work/jatax