Added loading check for buttons
Merge remote-tracking branch 'upstream/master'
Added loading check for buttons
Merge pull request #201 from jerv13/master

Added loading check for buttons