Adding API for Arduino
Resolving conflicts