diff --git a/config.ld b/config.ld
index 1f27ff3..076205d 100644
--- a/config.ld
+++ b/config.ld
@@ -5,7 +5,7 @@ backtick_references = true
 format = 'discount'
 title = "tiny-ecs API"
 one = true
-dir = doc
+dir = "doc"
 style = '!fixed'
 package = 'tiny-ecs'
 not_luadoc = true
diff --git a/init.lua b/init.lua
new file mode 100644
index 0000000..07250f8
--- /dev/null
+++ b/init.lua
@@ -0,0 +1,5 @@
+-- Helper Lua file for easy require if tiny-ecs is used as a git submodule or
+-- folder. Not needed in many cases, including luarocks distribution.
+
+local directory = (...):match("(.-)[^%.]+$")
+return require(directory .. 'tiny')
diff --git a/tiny.lua b/tiny.lua
index fc90623..88bb50c 100644
--- a/tiny.lua
+++ b/tiny.lua
@@ -137,7 +137,7 @@ do
             subParts[#subParts + 1] = buildPart(p:sub(2, -2))
             return ('\255%d'):format(#subParts)
         end)
-        for invert, part, sep in str:gmatch('(%!?)([^%|%&%!]+)([%|%&%!]?)') do
+        for invert, part, sep in str:gmatch('(%!?)([^%|%&%!]+)([%|%&]?)') do
             if part:match('^\255%d+$') then
                 local partIndex = tonumber(part:match(part:sub(2)))
                 accum[#accum + 1] = ('%s(%s)')