More logic to sync controller
Merge branch 'development' of https://github.com/acastaner/PEDevTracker into development