Fixed Ticket-Bugs.
Merge branch 'master' of https://github.com/EdgeCraft/EdgeCore