diff --git a/.gitignore b/.gitignore
index eb07ba1a4..074babef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ rel/example_project
 .concrete/DEV_MODE
 .rebar
 tmp
+_build/
+rebar.lock
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 0e0746463..68a43e189 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 eMQTT
+Copyright (c) 2018 EMQ X
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/README.md b/README.md
index f05e4ca02..2646c11ad 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ pool_sup[one_for_all supervisor]
 
 ## Author
 
-Feng Lee <feng@emqtt.io>
+Feng Lee <feng@emqx.io>
 
 
 ## License