diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a0c38a..24cd959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+<a name="1.6.1"></a>
+## [1.6.1](https://github.com/showdownjs/showdown/compare/1.6.0...1.6.1) (2017-01-28)
+
+
+### Bug Fixes
+
+* **simplifiedAutoLink:** fix missing spaces before and after email addresses ([5190b6a](https://github.com/showdownjs/showdown/commit/5190b6a)), closes [#330](https://github.com/showdownjs/showdown/issues/330)
+
+### Features
+
+* **encodeEmail:** add option to enable/disable mail obfuscation ([90c52b8](https://github.com/showdownjs/showdown/commit/90c52b8))
+
+### Notes
+
+This release also improves performance a bit (around 8%)
+
+
+
 <a name="1.6.0"></a>
 # [1.6.0](https://github.com/showdownjs/showdown/compare/1.5.5...1.6.0) (2017-01-09)
 
diff --git a/performance.json b/performance.json
index 6d20865..9c394aa 100644
--- a/performance.json
+++ b/performance.json
@@ -1 +1 @@
-{"1.6.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.33311933999999993,"maxTime":5.420096999999999,"minTime":0.15971599999999953},{"name":"readme.md","time":25.44548844000001,"maxTime":46.02170099999999,"minTime":23.55298099999993}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.5648424999999633,"maxTime":8.039136999999982,"minTime":1.9090580000001864},{"name":"anchors","time":0.4752454499999999,"maxTime":3.9495039999999335,"minTime":0.26066900000000714},{"name":"autoLinks","time":0.09918969999998808,"maxTime":0.21817799999985255,"minTime":0.07172100000002501},{"name":"blockQuotes","time":3.2650914000000055,"maxTime":5.968254000000115,"minTime":2.81220600000006},{"name":"codeBlocks","time":0.16970565000001442,"maxTime":0.32515699999999015,"minTime":0.14947000000006483},{"name":"codeSpans","time":0.19536575000001905,"maxTime":0.4047140000000127,"minTime":0.1410319999999956},{"name":"detab","time":0.12588919999999462,"maxTime":0.7358979999999065,"minTime":0.0834740000000238},{"name":"encodeAmpsAndAngles","time":0.041330299999992805,"maxTime":0.07895400000006703,"minTime":0.03676499999983207},{"name":"encodeBackslashEscapes","time":0.07710064999998849,"maxTime":0.13952499999982138,"minTime":0.06900900000005095},{"name":"encodeCode","time":0.5420397999999977,"maxTime":0.8715059999999539,"minTime":0.4899960000000192},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2584235499999977,"maxTime":0.5843190000000504,"minTime":0.21697199999994154},{"name":"githubCodeBlocks","time":0.16688814999997703,"maxTime":0.7126949999999397,"minTime":0.12837500000000546},{"name":"hashBlock","time":0.06207824999997911,"maxTime":0.46196999999983746,"minTime":0.03706599999986793},{"name":"hashElement","time":0.002305300000011812,"maxTime":0.03917500000011387,"minTime":0},{"name":"hashHTMLSpans","time":0.49181980000000747,"maxTime":2.6121089999999185,"minTime":0.24710800000002564},{"name":"hashPreCodeTags","time":0.12454829999996946,"maxTime":0.27483200000006036,"minTime":0.10215699999980643},{"name":"headers","time":0.7826081999999814,"maxTime":0.9121889999998984,"minTime":0.7220370000000003},{"name":"horizontalRule","time":0.20680210000003854,"maxTime":0.3025560000000951,"minTime":0.19648099999994884},{"name":"images","time":0.12029939999999897,"maxTime":0.8666850000001887,"minTime":0.07292699999993602},{"name":"italicsAndBold","time":0.09814999999999827,"maxTime":0.13771699999983866,"minTime":0.08889799999997194},{"name":"lists","time":4.961500850000005,"maxTime":5.655451000000085,"minTime":4.55642499999999},{"name":"outdent","time":0.175702699999988,"maxTime":0.26910700000007637,"minTime":0.14314199999989796},{"name":"paragraphs","time":3.5869644999999766,"maxTime":4.458787999999913,"minTime":3.1418840000001182},{"name":"spanGamut","time":1.3923465999999736,"maxTime":2.0371319999999287,"minTime":1.1773779999998624},{"name":"strikethrough","time":0.005710599999986243,"maxTime":0.1096909999998843,"minTime":0},{"name":"stripBlankLines","time":0.08912445000000843,"maxTime":0.14012800000000425,"minTime":0.08046100000001388},{"name":"stripLinkDefinitions","time":0.1653663000000279,"maxTime":0.22360200000002806,"minTime":0.14344299999993382},{"name":"tables","time":0.002079249999985677,"maxTime":0.034052999999858,"minTime":0.00030099999980848224},{"name":"unescapeSpecialChars","time":0.008663850000004913,"maxTime":0.03887400000007801,"minTime":0.0066299999998591375}]}],"1.6.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3075345600000001,"maxTime":5.369168,"minTime":0.1570040000000006},{"name":"readme.md","time":25.81825956,"maxTime":47.795452,"minTime":23.775378000000046}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.652987649999966,"maxTime":8.557761999999911,"minTime":1.8804290000000492},{"name":"anchors","time":0.5166509500000303,"maxTime":4.142066999999997,"minTime":0.27121600000009494},{"name":"autoLinks","time":0.0885518999999931,"maxTime":0.19437100000004648,"minTime":0.0705159999999978},{"name":"blockGamut","time":17.371581599999978,"maxTime":22.94093699999985,"minTime":14.081522999999834},{"name":"blockQuotes","time":3.011308699999995,"maxTime":4.110426000000189,"minTime":2.7742359999999735},{"name":"codeBlocks","time":0.24291900000000624,"maxTime":0.8344409999999698,"minTime":0.19346700000005512},{"name":"codeSpans","time":0.2271433000000002,"maxTime":0.4583549999999832,"minTime":0.19135800000003655},{"name":"detab","time":0.09469964999999547,"maxTime":0.13289599999984603,"minTime":0.08950099999992744},{"name":"encodeAmpsAndAngles","time":0.040486450000014426,"maxTime":0.07262600000012753,"minTime":0.03766799999993964},{"name":"encodeBackslashEscapes","time":0.09959649999997282,"maxTime":0.5095850000000155,"minTime":0.06840699999997923},{"name":"encodeCode","time":0.5320952499999863,"maxTime":0.7057630000001609,"minTime":0.4794489999999314},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.38607564999999794,"maxTime":0.7018459999999322,"minTime":0.326663999999937},{"name":"githubCodeBlocks","time":0.21441115000002356,"maxTime":0.7780880000000252,"minTime":0.15579800000000432},{"name":"hashBlock","time":0.056638900000007195,"maxTime":0.27995499999997264,"minTime":0.035257999999885214},{"name":"hashElement","time":0.001958799999999883,"maxTime":0.033148999999866646,"minTime":0},{"name":"hashHTMLSpans","time":0.38414695000003574,"maxTime":1.9973540000000867,"minTime":0.2356569999999465},{"name":"hashPreCodeTags","time":0.1327451500000393,"maxTime":0.20009700000014163,"minTime":0.1157189999998991},{"name":"headers","time":0.9440720999999825,"maxTime":2.4683650000001762,"minTime":0.7823069999999461},{"name":"images","time":0.12035954999996648,"maxTime":0.4857769999998709,"minTime":0.08588499999996202},{"name":"italicsAndBold","time":0.11076150000000098,"maxTime":0.4447930000001179,"minTime":0.08799499999986438},{"name":"lists","time":5.782546349999995,"maxTime":13.248890999999958,"minTime":4.463608999999906},{"name":"outdent","time":0.3057505000000219,"maxTime":0.9561860000001161,"minTime":0.22541000000001077},{"name":"paragraphs","time":6.582542549999971,"maxTime":8.810596000000032,"minTime":4.498867000000246},{"name":"spanGamut","time":2.43690389999997,"maxTime":3.067450000000008,"minTime":1.6474849999999606},{"name":"strikethrough","time":0.005228549999992537,"maxTime":0.10035000000016225,"minTime":0},{"name":"stripBlankLines","time":0.12142940000005638,"maxTime":0.17508399999996982,"minTime":0.09191199999986566},{"name":"stripLinkDefinitions","time":0.24673084999997172,"maxTime":0.572566000000279,"minTime":0.17146900000034293},{"name":"tables","time":0.005650249999962398,"maxTime":0.0985419999997248,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.016694800000050237,"maxTime":0.06569400000034875,"minTime":0.011450999999851774}]}]}
\ No newline at end of file
+{"1.6.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3172682400000001,"maxTime":5.4981469999999995,"minTime":0.16062000000000154},{"name":"readme.md","time":26.0144148,"maxTime":46.79858399999999,"minTime":24.245484999999917}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6414157500000215,"maxTime":7.791727999999921,"minTime":1.9364810000001853},{"name":"anchors","time":0.47462755000000245,"maxTime":4.062812000000122,"minTime":0.25885999999991327},{"name":"autoLinks","time":0.08906409999998459,"maxTime":0.19708299999979317,"minTime":0.06870800000001509},{"name":"blockQuotes","time":3.213485000000014,"maxTime":6.05383699999993,"minTime":2.880010000000084},{"name":"codeBlocks","time":0.16200620000001892,"maxTime":0.2691060000001926,"minTime":0.15308599999980288},{"name":"codeSpans","time":0.169494799999984,"maxTime":0.39868699999988166,"minTime":0.1410319999999956},{"name":"detab","time":0.12471390000000611,"maxTime":0.6647800000000643,"minTime":0.08558400000015354},{"name":"encodeAmpsAndAngles","time":0.04181244999999763,"maxTime":0.08920000000011896,"minTime":0.03796999999985928},{"name":"encodeBackslashEscapes","time":0.07586505000000443,"maxTime":0.13289599999984603,"minTime":0.06810500000005959},{"name":"encodeCode","time":0.5765897500000051,"maxTime":0.970348999999942,"minTime":0.4791480000001229},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.24603789999998754,"maxTime":0.35047099999997045,"minTime":0.22119199999997363},{"name":"githubCodeBlocks","time":0.1767573999999968,"maxTime":0.815454999999929,"minTime":0.1250600000000759},{"name":"hashBlock","time":0.06537804999999253,"maxTime":0.42972599999984595,"minTime":0.0376690000000508},{"name":"hashElement","time":0.0020039500000052614,"maxTime":0.034051999999974214,"minTime":0},{"name":"hashHTMLSpans","time":0.42437735000000887,"maxTime":2.3210050000000138,"minTime":0.24078000000008615},{"name":"hashPreCodeTags","time":0.12225794999998243,"maxTime":0.23836899999992056,"minTime":0.10396600000012768},{"name":"headers","time":0.8037480999999957,"maxTime":0.9462419999999838,"minTime":0.7256529999999657},{"name":"horizontalRule","time":0.2186149999999884,"maxTime":0.27362700000003315,"minTime":0.19437100000004648},{"name":"images","time":0.12388539999997192,"maxTime":0.9019430000000739,"minTime":0.07081799999991745},{"name":"italicsAndBold","time":0.10089220000002115,"maxTime":0.15037400000005618,"minTime":0.08950099999992744},{"name":"lists","time":4.938929699999983,"maxTime":5.421000999999933,"minTime":4.623625999999831},{"name":"outdent","time":0.1648239000000217,"maxTime":0.3372110000000248,"minTime":0.1404290000000401},{"name":"paragraphs","time":3.4947812,"maxTime":4.554917999999816,"minTime":3.1714170000000195},{"name":"spanGamut","time":1.318997649999983,"maxTime":1.9916279999999915,"minTime":1.1469409999999698},{"name":"strikethrough","time":0.007458499999995638,"maxTime":0.14314200000012534,"minTime":0},{"name":"stripBlankLines","time":0.09447364999999763,"maxTime":0.1545929999999771,"minTime":0.0822689999999966},{"name":"stripLinkDefinitions","time":0.1762751000000094,"maxTime":0.3112949999999728,"minTime":0.1464570000000549},{"name":"tables","time":0.0023505499999828317,"maxTime":0.03947699999980614,"minTime":0},{"name":"unescapeSpecialChars","time":0.008332400000006146,"maxTime":0.03375200000004952,"minTime":0.0066299999998591375}]}],"1.6.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3075345600000001,"maxTime":5.369168,"minTime":0.1570040000000006},{"name":"readme.md","time":25.81825956,"maxTime":47.795452,"minTime":23.775378000000046}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.652987649999966,"maxTime":8.557761999999911,"minTime":1.8804290000000492},{"name":"anchors","time":0.5166509500000303,"maxTime":4.142066999999997,"minTime":0.27121600000009494},{"name":"autoLinks","time":0.0885518999999931,"maxTime":0.19437100000004648,"minTime":0.0705159999999978},{"name":"blockGamut","time":17.371581599999978,"maxTime":22.94093699999985,"minTime":14.081522999999834},{"name":"blockQuotes","time":3.011308699999995,"maxTime":4.110426000000189,"minTime":2.7742359999999735},{"name":"codeBlocks","time":0.24291900000000624,"maxTime":0.8344409999999698,"minTime":0.19346700000005512},{"name":"codeSpans","time":0.2271433000000002,"maxTime":0.4583549999999832,"minTime":0.19135800000003655},{"name":"detab","time":0.09469964999999547,"maxTime":0.13289599999984603,"minTime":0.08950099999992744},{"name":"encodeAmpsAndAngles","time":0.040486450000014426,"maxTime":0.07262600000012753,"minTime":0.03766799999993964},{"name":"encodeBackslashEscapes","time":0.09959649999997282,"maxTime":0.5095850000000155,"minTime":0.06840699999997923},{"name":"encodeCode","time":0.5320952499999863,"maxTime":0.7057630000001609,"minTime":0.4794489999999314},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.38607564999999794,"maxTime":0.7018459999999322,"minTime":0.326663999999937},{"name":"githubCodeBlocks","time":0.21441115000002356,"maxTime":0.7780880000000252,"minTime":0.15579800000000432},{"name":"hashBlock","time":0.056638900000007195,"maxTime":0.27995499999997264,"minTime":0.035257999999885214},{"name":"hashElement","time":0.001958799999999883,"maxTime":0.033148999999866646,"minTime":0},{"name":"hashHTMLSpans","time":0.38414695000003574,"maxTime":1.9973540000000867,"minTime":0.2356569999999465},{"name":"hashPreCodeTags","time":0.1327451500000393,"maxTime":0.20009700000014163,"minTime":0.1157189999998991},{"name":"headers","time":0.9440720999999825,"maxTime":2.4683650000001762,"minTime":0.7823069999999461},{"name":"images","time":0.12035954999996648,"maxTime":0.4857769999998709,"minTime":0.08588499999996202},{"name":"italicsAndBold","time":0.11076150000000098,"maxTime":0.4447930000001179,"minTime":0.08799499999986438},{"name":"lists","time":5.782546349999995,"maxTime":13.248890999999958,"minTime":4.463608999999906},{"name":"outdent","time":0.3057505000000219,"maxTime":0.9561860000001161,"minTime":0.22541000000001077},{"name":"paragraphs","time":6.582542549999971,"maxTime":8.810596000000032,"minTime":4.498867000000246},{"name":"spanGamut","time":2.43690389999997,"maxTime":3.067450000000008,"minTime":1.6474849999999606},{"name":"strikethrough","time":0.005228549999992537,"maxTime":0.10035000000016225,"minTime":0},{"name":"stripBlankLines","time":0.12142940000005638,"maxTime":0.17508399999996982,"minTime":0.09191199999986566},{"name":"stripLinkDefinitions","time":0.24673084999997172,"maxTime":0.572566000000279,"minTime":0.17146900000034293},{"name":"tables","time":0.005650249999962398,"maxTime":0.0985419999997248,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.016694800000050237,"maxTime":0.06569400000034875,"minTime":0.011450999999851774}]}]}
\ No newline at end of file
diff --git a/performance.log.md b/performance.log.md
index 5ba9cd8..20e255a 100644
--- a/performance.log.md
+++ b/performance.log.md
@@ -6,41 +6,41 @@
 ### Test Suite: Basic (50 cycles)
 | test | avgTime | max | min |
 |:-----|--------:|----:|----:|
-|Simple "Hello World"|0.333|5.420|0.160|
-|readme.md|25.445|46.022|23.553|
+|Simple "Hello World"|0.317|5.498|0.161|
+|readme.md|26.014|46.799|24.245|
 
 ### Test Suite: subParsers (20 cycles)
 | test | avgTime | max | min |
 |:-----|--------:|----:|----:|
-|hashHTMLBlocks|2.565|8.039|1.909|
-|anchors|0.475|3.950|0.261|
-|autoLinks|0.099|0.218|0.072|
-|blockQuotes|3.265|5.968|2.812|
-|codeBlocks|0.170|0.325|0.149|
-|codeSpans|0.195|0.405|0.141|
-|detab|0.126|0.736|0.083|
-|encodeAmpsAndAngles|0.041|0.079|0.037|
-|encodeBackslashEscapes|0.077|0.140|0.069|
-|encodeCode|0.542|0.872|0.490|
-|escapeSpecialCharsWithinTagAttributes|0.258|0.584|0.217|
-|githubCodeBlocks|0.167|0.713|0.128|
-|hashBlock|0.062|0.462|0.037|
-|hashElement|0.002|0.039|0.000|
-|hashHTMLSpans|0.492|2.612|0.247|
-|hashPreCodeTags|0.125|0.275|0.102|
-|headers|0.783|0.912|0.722|
-|horizontalRule|0.207|0.303|0.196|
-|images|0.120|0.867|0.073|
-|italicsAndBold|0.098|0.138|0.089|
-|lists|4.962|5.655|4.556|
-|outdent|0.176|0.269|0.143|
-|paragraphs|3.587|4.459|3.142|
-|spanGamut|1.392|2.037|1.177|
-|strikethrough|0.006|0.110|0.000|
-|stripBlankLines|0.089|0.140|0.080|
-|stripLinkDefinitions|0.165|0.224|0.143|
-|tables|0.002|0.034|0.000|
-|unescapeSpecialChars|0.009|0.039|0.007|
+|hashHTMLBlocks|2.641|7.792|1.936|
+|anchors|0.475|4.063|0.259|
+|autoLinks|0.089|0.197|0.069|
+|blockQuotes|3.213|6.054|2.880|
+|codeBlocks|0.162|0.269|0.153|
+|codeSpans|0.169|0.399|0.141|
+|detab|0.125|0.665|0.086|
+|encodeAmpsAndAngles|0.042|0.089|0.038|
+|encodeBackslashEscapes|0.076|0.133|0.068|
+|encodeCode|0.577|0.970|0.479|
+|escapeSpecialCharsWithinTagAttributes|0.246|0.350|0.221|
+|githubCodeBlocks|0.177|0.815|0.125|
+|hashBlock|0.065|0.430|0.038|
+|hashElement|0.002|0.034|0.000|
+|hashHTMLSpans|0.424|2.321|0.241|
+|hashPreCodeTags|0.122|0.238|0.104|
+|headers|0.804|0.946|0.726|
+|horizontalRule|0.219|0.274|0.194|
+|images|0.124|0.902|0.071|
+|italicsAndBold|0.101|0.150|0.090|
+|lists|4.939|5.421|4.624|
+|outdent|0.165|0.337|0.140|
+|paragraphs|3.495|4.555|3.171|
+|spanGamut|1.319|1.992|1.147|
+|strikethrough|0.007|0.143|0.000|
+|stripBlankLines|0.094|0.155|0.082|
+|stripLinkDefinitions|0.176|0.311|0.146|
+|tables|0.002|0.039|0.000|
+|unescapeSpecialChars|0.008|0.034|0.007|
 
 
 ## [version 1.6.0](https://github.com/showdownjs/showdown/tree/1.6.0)