diff --git a/license.txt b/license.txt
new file mode 100644
index 0000000..2ae6603
--- /dev/null
+++ b/license.txt
@@ -0,0 +1,95 @@
+LIMITED LICENSE AGREEMENT
+
+You (“Company” or “You”) must read this Limited License Agreement (this
+"Agreement") carefully and thoroughly before downloading, installing,
+and/or using any software or content (“Software”) provided herewith.
+BY DOWNLOADING, INSTALLING AND/OR USING ANY SOFTWARE OR CONTENT, YOU ARE
+CONFIRMING YOUR ACCEPTANCE OF THE TERMS OF THIS AGREEMENT. IF YOU DO NOT
+AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT, THEN DO NOT DOWNLOAD,
+INSTALL/COMPLETE INSTALLATION OF, OR USE THE SOFTWARE OR CONTENT.
+
+1. Grant of License. Atmel grants Company a non-exclusive, non-transferable,
+limited license: (a) to internally use the Software as a development platform
+solely in connection with an Atmel microcontroller product (“Atmel Product”),
+(b) to internally modify the source code version of the Software solely as
+necessary to implement such Software in products developed by Company that
+incorporate an Atmel Product (“Company Products”), and (c) to distribute the
+Software solely as implemented in Company Products. Company shall not use
+the Software for any purpose other than as specifically authorized herein.
+	
+2. Title. As between the parties, Atmel retains full rights, title, and
+ownership including all patents, copyrights, trade secrets, trade names,
+trademarks, and other intellectual property rights in and to the Software.
+Company agrees to take all reasonable steps to prevent unauthorized disclosure
+of the Software.
+
+3. No Other Rights. Except as expressly stated herein, this Agreement does not
+grant Company, by implication, estoppels or otherwise, any rights to patents,
+copyrights, trade secrets, trade names, trademarks (whether registered or
+unregistered), or any other rights, franchises, or licenses in respect of the
+Software. Atmel will not provide any support or maintenance for the Software.
+Company will be solely responsible for supporting its customers, including
+resellers and end users.
+
+4. No Support and Disclaimer of Warranty. Atmel is not obligated to furnish or
+make available to Company any further information, software, technical
+information, know-how, show-how, bug-fixes, or support. Atmel reserves the
+right to make changes to the Software without further notice. ATMEL IS
+PROVIDING THE SOFTWARE TO COMPANY “AS IS”, “WITH ALL FAULTS”, AND WITH NO
+WARRANTY WHATSOEVER. ATMEL MAKES NO WARRANTY THAT THE SOFTWARE IS COMPLETE,
+VERIFIED, OR VALIDATED. ATMEL IS MAKING NO REPRESENTATION THAT THE SOFTWARE IS
+FREE FROM ANY CLAIMS OF INFRINGEMENT. ATMEL MAKES NO WARRANTY WHATSOEVER,
+EXPRESS, IMPLIED, STATUTORY, CONTRACTUAL OR OTHERWISE WITH RESPECT TO THE
+SOFTWARE, AND EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT AND ANY WARRANTIES
+ARISING BY VIRTUE OF CUSTOM OF TRADE OR COURSE OF DEALING. 
+
+5. Notice and Protection. Company agrees not to remove or destroy any
+proprietary trademark or copyright markings or notices placed upon or contained
+within the Software or any related documentation. 
+
+6. Export. Company acknowledges that the certain laws and regulations may
+restrict the export and re-export of the Software. Company will not export or
+re-export any Software (including the diskettes, related documentation and/or
+any hardware peripherals) in any form without the appropriate United States
+and foreign governmental approval.
+
+7. Termination. The license will automatically terminate if Company fails to
+comply with any of the terms and conditions of the license. Upon termination
+for any reason, Company will immediately destroy or return to Atmel the
+Software, including all documentation and all whole or partial copies of
+the Software.
+
+8. LIMITATION OF LIABILITY. IN NO EVENT SHALL ATMEL BE LIABLE TO COMPANY OR
+ANY THIRD PARTY FOR ANY CONSEQUENTIAL, SPECIAL, INDIRECT OR INCIDENTAL
+DAMAGES ARISING OUT OF OR RELATING TO THE SOFTWARE OR ANY OTHER ASPECT OF
+THIS AGREEMENT, EVEN IF ATMEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. IN NO EVENT SHALL THE LIABILITY OF ATMEL ARISING OUT OF OR RELATING
+TO THIS AGREEMENT EXCEED THE GREATER OF ONE THOUSAND U.S. DOLLARS (US$1,000)
+OR THE PRICE PAID BY COMPANY TO ATMEL FOR THE SOFTWARE.
+
+9. General. This Agreement and all transactions concluded hereunder shall be
+governed by the laws of the State of California, as such laws are applied to
+contracts entered into and performed entirely in California by California
+residents. Any litigation relating to this Agreement shall be subject to the
+exclusive jurisdiction of the state courts located in Santa Clara County,
+California, or the federal courts located in the Northern District of
+California. If any provision of this Agreement is held to be invalid, illegal
+or unenforceable, that provision shall be construed in such a manner that it
+becomes valid and enforceable and so as to reflect most closely the intent of
+the parties in agreeing upon the provision in the first place, and the
+remaining provisions of this Agreement shall continue in full force and effect
+and shall not in any way be affected or impaired by any such determination of
+invalidity, illegality or unenforceability.
+
+THIS AGREEMENT IS THE ENTIRE AND EXCLUSIVE AGREEMENT BETWEEN ATMEL AND
+COMPANY AND SUPERSEDES ALL PRIOR ORAL AND WRITTEN AGREEMENTS AND
+COMMUNICATIONS BETWEEN THE PARTIES PERTAINING TO THE SUBJECT MATTER OF THIS
+AGREEMENT. NO DIFFERENT OR ADDITIONAL TERMS WILL BE ENFORCEABLE AGAINST ATMEL
+UNLESS ATMEL GIVES ITS EXPRESS WRITTEN CONSENT, INCLUDING AN EXPRESS WAIVER
+OF THE TERMS OF THIS AGREEMENT.
+
+Atmel Corporation
+1600 Technology Drive
+San Jose, CA 95110
+http://www.atmel.com
diff --git a/src/lwm/nwk/nwk.c b/src/lwm/nwk/nwk.c
index aaf5340..13e4320 100644
--- a/src/lwm/nwk/nwk.c
+++ b/src/lwm/nwk/nwk.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwk.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwk.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwk.h b/src/lwm/nwk/nwk.h
index b450e8f..323bfce 100644
--- a/src/lwm/nwk/nwk.h
+++ b/src/lwm/nwk/nwk.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwk.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwk.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkCommand.h b/src/lwm/nwk/nwkCommand.h
index 6d1e69c..344b79b 100644
--- a/src/lwm/nwk/nwkCommand.h
+++ b/src/lwm/nwk/nwkCommand.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkCommand.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkCommand.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkDataReq.c b/src/lwm/nwk/nwkDataReq.c
index 3bc78b3..ccabe1e 100644
--- a/src/lwm/nwk/nwkDataReq.c
+++ b/src/lwm/nwk/nwkDataReq.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkDataReq.c 9165 2014-02-03 23:47:21Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkDataReq.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkDataReq.h b/src/lwm/nwk/nwkDataReq.h
index 2d621be..476b0e2 100644
--- a/src/lwm/nwk/nwkDataReq.h
+++ b/src/lwm/nwk/nwkDataReq.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkDataReq.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkDataReq.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkFrame.c b/src/lwm/nwk/nwkFrame.c
index 7c2ab45..abf61de 100644
--- a/src/lwm/nwk/nwkFrame.c
+++ b/src/lwm/nwk/nwkFrame.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkFrame.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkFrame.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkFrame.h b/src/lwm/nwk/nwkFrame.h
index 67019d8..80623d3 100644
--- a/src/lwm/nwk/nwkFrame.h
+++ b/src/lwm/nwk/nwkFrame.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkFrame.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkFrame.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkGroup.c b/src/lwm/nwk/nwkGroup.c
index 7d3cdbf..48077e9 100644
--- a/src/lwm/nwk/nwkGroup.c
+++ b/src/lwm/nwk/nwkGroup.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkGroup.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkGroup.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkGroup.h b/src/lwm/nwk/nwkGroup.h
index 51c1b33..55a7927 100644
--- a/src/lwm/nwk/nwkGroup.h
+++ b/src/lwm/nwk/nwkGroup.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkGroup.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkGroup.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkRoute.c b/src/lwm/nwk/nwkRoute.c
index cd1e1e9..cad405c 100644
--- a/src/lwm/nwk/nwkRoute.c
+++ b/src/lwm/nwk/nwkRoute.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkRoute.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRoute.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkRoute.h b/src/lwm/nwk/nwkRoute.h
index b9d1ba8..99c21ec 100644
--- a/src/lwm/nwk/nwkRoute.h
+++ b/src/lwm/nwk/nwkRoute.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkRoute.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRoute.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkRouteDiscovery.c b/src/lwm/nwk/nwkRouteDiscovery.c
index be69e50..287144b 100644
--- a/src/lwm/nwk/nwkRouteDiscovery.c
+++ b/src/lwm/nwk/nwkRouteDiscovery.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkRouteDiscovery.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRouteDiscovery.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkRouteDiscovery.h b/src/lwm/nwk/nwkRouteDiscovery.h
index 59f5e29..9d655ca 100644
--- a/src/lwm/nwk/nwkRouteDiscovery.h
+++ b/src/lwm/nwk/nwkRouteDiscovery.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkRouteDiscovery.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRouteDiscovery.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkRx.c b/src/lwm/nwk/nwkRx.c
index b6b3f91..10a221e 100644
--- a/src/lwm/nwk/nwkRx.c
+++ b/src/lwm/nwk/nwkRx.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkRx.c 9169 2014-02-05 21:57:15Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRx.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
@@ -84,7 +87,7 @@ typedef struct NwkDuplicateRejectionEntry_t
 
 /*- Prototypes -------------------------------------------------------------*/
 static void nwkRxDuplicateRejectionTimerHandler(SYS_Timer_t *timer);
-static bool nwkRxSeriveDataInd(NWK_DataInd_t *ind);
+static bool nwkRxServiceDataInd(NWK_DataInd_t *ind);
 
 /*- Variables --------------------------------------------------------------*/
 static NwkDuplicateRejectionEntry_t nwkRxDuplicateRejectionTable[NWK_DUPLICATE_REJECTION_TABLE_SIZE];
@@ -105,7 +108,7 @@ void nwkRxInit(void)
   nwkRxDuplicateRejectionTimer.mode = SYS_TIMER_INTERVAL_MODE;
   nwkRxDuplicateRejectionTimer.handler = nwkRxDuplicateRejectionTimerHandler;
 
-  NWK_OpenEndpoint(NWK_SERVICE_ENDPOINT_ID, nwkRxSeriveDataInd);
+  NWK_OpenEndpoint(NWK_SERVICE_ENDPOINT_ID, nwkRxServiceDataInd);
 }
 
 /*************************************************************************//**
@@ -251,7 +254,7 @@ static bool nwkRxRejectDuplicate(NwkFrameHeader_t *header)
 
 /*************************************************************************//**
 *****************************************************************************/
-static bool nwkRxSeriveDataInd(NWK_DataInd_t *ind)
+static bool nwkRxServiceDataInd(NWK_DataInd_t *ind)
 {
 #ifdef NWK_ENABLE_SECURE_COMMANDS
   if (0 == (ind->options & NWK_IND_OPT_SECURED))
diff --git a/src/lwm/nwk/nwkRx.h b/src/lwm/nwk/nwkRx.h
index 5df90ec..e242acd 100644
--- a/src/lwm/nwk/nwkRx.h
+++ b/src/lwm/nwk/nwkRx.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkRx.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkRx.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkSecurity.c b/src/lwm/nwk/nwkSecurity.c
index 34ed403..31cfe18 100644
--- a/src/lwm/nwk/nwkSecurity.c
+++ b/src/lwm/nwk/nwkSecurity.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkSecurity.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkSecurity.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkSecurity.h b/src/lwm/nwk/nwkSecurity.h
index 897ba7b..c375993 100644
--- a/src/lwm/nwk/nwkSecurity.h
+++ b/src/lwm/nwk/nwkSecurity.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkSecurity.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkSecurity.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkTx.c b/src/lwm/nwk/nwkTx.c
index c91fdb6..5616dba 100644
--- a/src/lwm/nwk/nwkTx.c
+++ b/src/lwm/nwk/nwkTx.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: nwkTx.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkTx.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/nwk/nwkTx.h b/src/lwm/nwk/nwkTx.h
index a71bf4d..fd5c42e 100644
--- a/src/lwm/nwk/nwkTx.h
+++ b/src/lwm/nwk/nwkTx.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: nwkTx.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: nwkTx.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/phy/atmegarfr2.h b/src/lwm/phy/atmegarfr2.h
index 231a74a..d73462e 100644
--- a/src/lwm/phy/atmegarfr2.h
+++ b/src/lwm/phy/atmegarfr2.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: atmegarfr2.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: atmegarfr2.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/phy/phy.c b/src/lwm/phy/phy.c
index 15d887b..fff052a 100644
--- a/src/lwm/phy/phy.c
+++ b/src/lwm/phy/phy.c
@@ -38,7 +38,10 @@
  *
  * \asf_license_stop
  *
- * $Id: phy.c 9200 2014-02-18 21:10:58Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: phy.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/phy/phy.h b/src/lwm/phy/phy.h
index 412ca04..203ddad 100644
--- a/src/lwm/phy/phy.h
+++ b/src/lwm/phy/phy.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: phy.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: phy.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sys.c b/src/lwm/sys/sys.c
index 2cd68a6..75b4138 100644
--- a/src/lwm/sys/sys.c
+++ b/src/lwm/sys/sys.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: sys.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sys.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sys.h b/src/lwm/sys/sys.h
index f8c3484..c425bfe 100644
--- a/src/lwm/sys/sys.h
+++ b/src/lwm/sys/sys.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: sys.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sys.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysConfig.h b/src/lwm/sys/sysConfig.h
index 7e41c44..f3b0237 100644
--- a/src/lwm/sys/sysConfig.h
+++ b/src/lwm/sys/sysConfig.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: sysConfig.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysConfig.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysEncrypt.c b/src/lwm/sys/sysEncrypt.c
index 9cb24c2..f936c1c 100644
--- a/src/lwm/sys/sysEncrypt.c
+++ b/src/lwm/sys/sysEncrypt.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: sysEncrypt.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysEncrypt.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysEncrypt.h b/src/lwm/sys/sysEncrypt.h
index a604ba5..418b387 100644
--- a/src/lwm/sys/sysEncrypt.h
+++ b/src/lwm/sys/sysEncrypt.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: sysEncrypt.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysEncrypt.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysTimer.c b/src/lwm/sys/sysTimer.c
index 0ef8128..0b787af 100644
--- a/src/lwm/sys/sysTimer.c
+++ b/src/lwm/sys/sysTimer.c
@@ -37,7 +37,10 @@
  *
  * \asf_license_stop
  *
- * $Id: sysTimer.c 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysTimer.c 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysTimer.h b/src/lwm/sys/sysTimer.h
index 1eb5c12..e8a33bc 100644
--- a/src/lwm/sys/sysTimer.h
+++ b/src/lwm/sys/sysTimer.h
@@ -40,7 +40,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: sysTimer.h 9157 2014-01-28 19:32:53Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysTimer.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
diff --git a/src/lwm/sys/sysTypes.h b/src/lwm/sys/sysTypes.h
index 266a071..669b7fa 100644
--- a/src/lwm/sys/sysTypes.h
+++ b/src/lwm/sys/sysTypes.h
@@ -41,7 +41,10 @@ extern "C" {
  *
  * \asf_license_stop
  *
- * $Id: sysTypes.h 9177 2014-02-06 21:06:25Z ataradov $
+ * Modification and other use of this code is subject to Atmel's Limited
+ * License Agreement (license.txt).
+ *
+ * $Id: sysTypes.h 9267 2014-03-18 21:46:19Z ataradov $
  *
  */
 
@@ -102,6 +105,12 @@ extern "C" {
 
     #define SYS_MCU_ARCH_CORTEX_M
 
+  #elif defined(HAL_ATSAMD21J18)
+    #define DONT_USE_CMSIS_INIT
+    #include "samd21j18a.h"
+
+    #define SYS_MCU_ARCH_CORTEX_M
+
   #else // All AVRs
     #include <avr/io.h>
     #include <avr/wdt.h>
@@ -155,6 +164,7 @@ extern "C" {
 #elif defined(HAL_ATXMEGA128B1)
 #elif defined(HAL_ATXMEGA256A3U)
 #elif defined(HAL_ATSAMD20J18)
+#elif defined(HAL_ATSAMD21J18)
 #else
   #error Unknown HAL
 #endif