diff --git a/md2bbc.py b/md2bbc.py
index f31cd8a..4c2f969 100755
--- a/md2bbc.py
+++ b/md2bbc.py
@@ -29,8 +29,8 @@ r_h1 = re.compile("^# (.+)$", re.I|re.M)
 r_h2 = re.compile("^## (.+)$", re.I|re.M)
 r_h3 = re.compile("^### (.+)$", re.I|re.M)
 r_link = re.compile("(\W)\[(.+?)\]\((.+?)\)(\W)", re.I|re.M)
-r_em = re.compile("([^\w*])\*(\w.+?\w)\*([^\w*])", re.I|re.M)
-r_strong = re.compile("(\W)\*{2}(\w.+?\w)\*{2}(\W)", re.I|re.M)
+r_strong = re.compile("(\W|^)\*{2}(\w.+?)\*{2}(\W|$)", re.I|re.M)
+r_em = re.compile("(\W|^)\*(\w.+?)\*(\W|$)", re.I|re.M)
 
 # Open and extract document
 markdown = args.input.read().splitlines()
diff --git a/sample.md b/sample.md
index fa44905..62f7722 100644
--- a/sample.md
+++ b/sample.md
@@ -1,17 +1,26 @@
+**This is a short introduction to a sample article.**
+
 {{ tableofcontents }}
 
-# Heading 1
+# Lorem
 
-## Heading 1.1
+## Ipsum dolor
 
-Some text
+Sit amet, *consectetur adipiscing* elit. Etiam consectetur erat **vel enim consectetur** fermentum. Cras id auctor nulla, *ut sagittis orci*. Donec laoreet **libero sit** amet convallis ullamcorper.
 
-### Heading 1.1.1
+### Vivamus vel
 
-Another **strong text** with *emphasis* and [a link](https://domain.tld) and [another one](https://domain.tld).
+*Vivamus vel ligula posuere, semper ligula a, eleifend arcu. Duis risus sapien, facilisis a rhoncus vitae, sagittis nec neque.*
 
-### Heading 1.1.2
+### Pellentesque ut
 
-## Heading 1.2
+Pellentesque ut finibus risus. Curabitur vitae risus ac ex molestie tempus. Phasellus faucibus elit odio, [in bibendum](https://domain.tld) magna semper in.
 
-# Heading 2
+## Maecenas scelerisque
+
+Maecenas scelerisque, tellus ut egestas condimentum, odio nunc aliquam lorem, in scelerisque tellus ligula ut elit. Sed tempor leo est.
+
+# Aenean varius
+
+Aenean varius, augue eu posuere tristique, sem lacus sagittis felis, at tincidunt metus elit sit amet mi. Phasellus efficitur metus felis, et rutrum tortor efficitur sit amet.
+Maecenas sagittis metus ac nisl accumsan vehicula. Aenean eget lacus posuere, pellentesque sem quis, molestie augue. Phasellus euismod pellentesque tortor non pretium.