Merge pull request #55 from sourishkrout/master

Major refactoring and made element lookup by name available
Fixes for context based look up.