Merge pull request #8 from add00/bug_2796

[2796] Added cache and locker decorators.
[2942] Problem with IE fixed.
[2942] Fixed problem with IE.
Merge pull request #10 from add00/bug_2942

Bug 2942
[2944] Fixed conflicts.
[2944] Fixed conflicts.