diff --git a/library.properties b/library.properties
index 10b0426..441ebef 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=knx
-version=1.0.0
+version=1.2.0
 author=Thomas Kunze
 maintainer=Thomas Kunze
 sentence=knx stack
diff --git a/src/knx/bits.h b/src/knx/bits.h
index 6a2b771..565d24c 100644
--- a/src/knx/bits.h
+++ b/src/knx/bits.h
@@ -36,13 +36,13 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
 
 #elif ARDUINO_ARCH_SAMD || ARDUINO_ARCH_STM32
 #include <Arduino.h>
-#define htons(x) ( (((x)<<8)&0xFF00) | (((x)>>8)&0xFF) )
+
+#define getbyte(x,n) (*(((uint8_t*)&(x))+n))
+#define htons(x)  ( (getbyte(x,0)<<8) | getbyte(x,1) ) 
+#define htonl(x) ( (getbyte(x,0)<<24) | getbyte(x,1)<<16) | (getbyte(x,2)<<8) | getbyte(x,3) )
 #define ntohs(x) htons(x)
-#define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \
-                   ((x)<< 8 & 0x00FF0000UL) | \
-                   ((x)>> 8 & 0x0000FF00UL) | \
-                   ((x)>>24 & 0x000000FFUL) )
 #define ntohl(x) htonl(x)
+
 #elif ARDUINO_ARCH_ESP8266
 #include <Arduino.h>
 #include <user_interface.h>
@@ -84,4 +84,4 @@ uint8_t* pushInt(uint32_t i, uint8_t* data);
 uint8_t* pushByteArray(const uint8_t* src, uint32_t size, uint8_t* data);
 uint16_t getWord(const uint8_t* data);
 uint32_t getInt(const uint8_t* data);
-void printHex(const char* suffix, const uint8_t *data, size_t length);
\ No newline at end of file
+void printHex(const char* suffix, const uint8_t *data, size_t length);