fixed initial load issues with store/scope
Merge pull request #30 from vahaknp/master

fixed initial load issues with store/scope