eletau modifications
Merge branch 'dev_v2' of https://github.com/paktinat/STau into dev_v2