Update project, need to merge into master.
Merge pull request #2 from palistov/resourceload

Update project, need to merge into master.