Merge pull request #2 from kaapyth0n/master

fixes from field experience
Fix merge
Upgrade project for modbus work with display
or any other device
Merge pull request #2 from Kira-sempai/master

update from kira