Merge pull request #2 from witspirit/master

Update fork
Merge pull request #3 from witspirit/master

Merge 1.4 version
Reference resolution has been reworked
Refactoring
Refactoring
Merge remote-tracking branch 'origin/pr/17'

Conflicts:
	META-INF/plugin.xml
Updating references and plugin description