Merge pull request #132 from pheonix7117/develop

Testing updates and loading widget inclusion merge from Cheni.