diff --git a/lesscpy/lessc/lexer.py b/lesscpy/lessc/lexer.py
index 3dd876c..a232bc1 100644
--- a/lesscpy/lessc/lexer.py
+++ b/lesscpy/lessc/lexer.py
@@ -99,6 +99,7 @@ class LessLexer:
             t.type = 'css_dom'
             t.value = t.value
         elif c == '@':
+            v = v.lower()
             if v in LessLexer.reserved:
                 t.type = LessLexer.reserved[v]
             else:
diff --git a/lesscpy/plib/statement.py b/lesscpy/plib/statement.py
index 2fb8a81..8bcad6b 100644
--- a/lesscpy/plib/statement.py
+++ b/lesscpy/plib/statement.py
@@ -8,7 +8,7 @@
 from .process import Process
 
 class Statement(Process):
-    format = "%(identifier)s%(ws)s%(value)s;%(nl)s"
+    format = "%(identifier)s %(value)s;%(nl)s"
     
     def parse(self, scope):
         """ Parse Node
diff --git a/lesscpy/test/css/css.css b/lesscpy/test/css/css.css
index f91d296..d8c3c50 100644
--- a/lesscpy/test/css/css.css
+++ b/lesscpy/test/css/css.css
@@ -1,4 +1,5 @@
 @charset "utf-8";
+@CHARSET "utf-8";
 div {
 	color: black;
 }
diff --git a/lesscpy/test/css/css.min.css b/lesscpy/test/css/css.min.css
index fa7c9fe..c876c57 100644
--- a/lesscpy/test/css/css.min.css
+++ b/lesscpy/test/css/css.min.css
@@ -1,4 +1,4 @@
-@charset"utf-8";div{color:black;}
+@charset "utf-8";@CHARSET "utf-8";div{color:black;}
 div{width:99%;}
 *{min-width:45em;}
 h1, h2 > a > p, h3{color:none;}
diff --git a/lesscpy/test/css/import.min.css b/lesscpy/test/css/import.min.css
index 510b4a2..ca3980d 100644
--- a/lesscpy/test/css/import.min.css
+++ b/lesscpy/test/css/import.min.css
@@ -1 +1 @@
-@import'some.css.file.css';@import'some/other.css.file.CSS';.import{color:red;width:6px;height:9px;}
+@import 'some.css.file.css';@import 'some/other.css.file.CSS';.import{color:red;width:6px;height:9px;}
diff --git a/lesscpy/test/less/css.less b/lesscpy/test/less/css.less
index 487905a..f41a34a 100644
--- a/lesscpy/test/less/css.less
+++ b/lesscpy/test/less/css.less
@@ -1,4 +1,5 @@
 @charset "utf-8";
+@CHARSET "utf-8";
 div { color: black; }
 div { width: 99%; }