Merge pull request #21 from vania-pooh/master

Fixed issue with incorrect resources loading
Added resource watcher draft