Use document.id instead of $ for jquery-compatibility
Merge branch 'hotfix/1.3.1'