diff --git a/Code/IO/btkBinaryByteOrderFormat.h b/Code/IO/btkBinaryByteOrderFormat.h
index f3799f98..8e3330e9 100644
--- a/Code/IO/btkBinaryByteOrderFormat.h
+++ b/Code/IO/btkBinaryByteOrderFormat.h
@@ -48,7 +48,7 @@
     #error Processor not supported
   #endif
 #elif defined __GNUC__
-  #if defined __i386__ || defined __x86_64__
+  #if defined __aarch64__ || defined __i386__ || defined __x86_64__
     #define PROCESSOR_TYPE 1 /* IEEE_LittleEndian */
   #elif defined __vax__
     #define PROCESSOR_TYPE 2 /* VAX_LittleEndian */
@@ -887,4 +887,4 @@ namespace btk
   };
 };
 
-#endif // __btkByteOrderFormat_h
\ No newline at end of file
+#endif // __btkByteOrderFormat_h
diff --git a/Readme.md b/Readme.md
index 4dafd10f..fd698900 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,27 +1,48 @@
-#BTKCore#
+# BTKCore
 
-##Introduction##
+## Introduction
 
-Core of the project Biomechanical-ToolKit (BTK) which represent biomechanical data, file formats and data processing
+Core of the project Biomechanical-ToolKit (BTK) which represent biomechanical
+data, file formats and data processing
 
-BTK is an open-source and cross-platform library for biomechanical analysis. BTK read and write acquisition files and can modify them. All these operations can be done by the use of the C++ API or by the wrappers included (Matlab, Octave, and Python).
+BTK is an open-source and cross-platform library for biomechanical analysis.
+BTK read and write acquisition files and can modify them. All these operations
+can be done by the use of the C++ API or by the wrappers included (Matlab,
+Octave, and Python).
 
-All the informations to build the C++ libraries and bindings are provided in file 'Readme.html' which is located in the root of the source code.
+All the informations to build the C++ libraries and bindings are provided in
+file 'Readme.html' which is located in the root of the source code.
 
-APIs documentation and tutorials are proposed on the main website of the project: http://b-tk.googlecode.com
+APIs documentation and tutorials are proposed on the main website of the
+project: http://b-tk.googlecode.com
 
-##Continuous integration##
+## Continuous integration
 
-To test the implemented features as well as to verify the modification in the code, hundreds of cases representing standard usages of the project are tested at each revision of the project.
+To test the implemented features as well as to verify the modification in the
+code, hundreds of cases representing standard usages of the project are tested
+at each revision of the project.
 
-Tests are built for the different supported operating systems (MacOS X, Linux) as well as for the different supported languages (C++, Matlab/Octave, and Python).
-All the tests are realized on the `master` branch of the code which corresponds to the next version of the project.
+Tests are built for the different supported operating systems (MacOS X, Linux)
+as well as for the different supported languages (C++, Matlab/Octave, and
+Python). All the tests are realized on the `master` branch of the code which
+corresponds to the next version of the project.
 
-###MacOS X 64-bit (C++, Python) [![Build Status](https://travis-ci.org/Biomechanical-ToolKit/BTKCore.png?branch=master)](https://travis-ci.org/Biomechanical-ToolKit/BTKCore)###
-Built from MacOS 10.8.2 and XCode 4.6.1. Configured to build C++ modules as static and shared 64-bit libraries (with Clang and GCC). Python binding is built with the MacOS X embedded version of Python and Numpy, while Swig is installed with Homebrew.
+### MacOS X 64-bit (C++, Python) [![Build Status](https://travis-ci.org/Biomechanical-ToolKit/BTKCore.png?branch=master)](https://travis-ci.org/Biomechanical-ToolKit/BTKCore)
 
-###Linux 64-bit (C++, Python, Octave) [![Build Status](https://drone.io/Biomechanical-ToolKit/b-tk.core/status.png)](https://drone.io/Biomechanical-ToolKit/b-tk.core/latest)###
-Built from Ubuntu 12.04 and GCC 4.6. Configured to build C++ modules as shared 64-bit libraries. Python and Octave bindings are built from the application/libraries furnished with Ubuntu 12.04 (i.e. Python 2.7.3, Numpy 1.6.1, Swig 2.0.4, and Octave 3.2).
+Built from MacOS 10.8.2 and XCode 4.6.1. Configured to build C++ modules as
+static and shared 64-bit libraries (with Clang and GCC). Python binding is
+built with the MacOS X embedded version of Python and Numpy, while Swig is
+installed with Homebrew.
 
-###Windows 7 32-bit (C++, Python, Octave) [![Build Status](http://ec2-54-226-241-28.compute-1.amazonaws.com:8080/buildStatus/icon?job=BTKCore)](http://ec2-54-226-241-28.compute-1.amazonaws.com:8080/view/All/job/BTKCore/)###
-Built from MSVC 2010 (Windows SDK 7.1). Configured to build C++ modules as shared 32-bit libraries. The Python binding is built with Python 2.7.5, Numpy 1.8.0 and Swig 2.0.11. The Octave binding is built with Octave 3.6.4.
\ No newline at end of file
+### Linux 64-bit (C++, Python, Octave) [![Build Status](https://drone.io/Biomechanical-ToolKit/b-tk.core/status.png)](https://drone.io/Biomechanical-ToolKit/b-tk.core/latest)
+
+Built from Ubuntu 12.04 and GCC 4.6. Configured to build C++ modules as shared
+64-bit libraries. Python and Octave bindings are built from the
+application/libraries furnished with Ubuntu 12.04 (i.e. Python 2.7.3, Numpy
+1.6.1, Swig 2.0.4, and Octave 3.2).
+
+### Windows 7 32-bit (C++, Python, Octave) [![Build Status](http://ec2-54-226-241-28.compute-1.amazonaws.com:8080/buildStatus/icon?job=BTKCore)](http://ec2-54-226-241-28.compute-1.amazonaws.com:8080/view/All/job/BTKCore/)
+
+Built from MSVC 2010 (Windows SDK 7.1). Configured to build C++ modules as
+shared 32-bit libraries. The Python binding is built with Python 2.7.5, Numpy
+1.8.0 and Swig 2.0.11. The Octave binding is built with Octave 3.6.4.
diff --git a/btkConfigure.h.in b/btkConfigure.h.in
index 2c7a3bff..11e97a83 100644
--- a/btkConfigure.h.in
+++ b/btkConfigure.h.in
@@ -43,7 +43,7 @@
 
 // Compiled on a 64 bit OS?
 #if defined(__APPLE__)
-  #if defined __x86_64__ || defined __ppc64__
+  #if defined __aarch64__ || defined __ppc64__ || defined __x86_64__
     #define HAVE_64_BIT
   #endif
 #else