First commit with code from the library (20-10-2015 - 1b48580)