Merge pull request #201 from jerv13/master

Added loading check for buttons