diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 44ffc368..79572e3d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -8,6 +8,8 @@ add_executable (led-bar led-bar.cxx)
 add_executable (seg-lcd 4digitdisplay.cxx)
 add_executable (nrf_transmitter nrf_transmitter.cxx)
 add_executable (nrf_receiver nrf_receiver.cxx)
+add_executable (es08a es08a.cxx)
+add_executable (son-hcsr04 hcsr04.cxx)
 
 include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l)
 include_directories (${PROJECT_SOURCE_DIR}/src/grove)
@@ -16,6 +18,8 @@ include_directories (${PROJECT_SOURCE_DIR}/src/buzzer)
 include_directories (${PROJECT_SOURCE_DIR}/src/ledbar)
 include_directories (${PROJECT_SOURCE_DIR}/src/4digitdisplay)
 include_directories (${PROJECT_SOURCE_DIR}/src/nrf24l01)
+include_directories (${PROJECT_SOURCE_DIR}/src/servo)
+include_directories (${PROJECT_SOURCE_DIR}/src/hcsr04)
 
 target_link_libraries (compass hmc5883l ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (groveled grove ${CMAKE_THREAD_LIBS_INIT})
@@ -27,3 +31,5 @@ target_link_libraries (led-bar ledbar ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (seg-lcd 4digitdisplay ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (nrf_transmitter nrf24l01 ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries (son-hcsr04 hcsr04 ${CMAKE_THREAD_LIBS_INIT})
diff --git a/examples/es08a.cxx b/examples/es08a.cxx
new file mode 100644
index 00000000..c82bb255
--- /dev/null
+++ b/examples/es08a.cxx
@@ -0,0 +1,68 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include "es08a.h"
+#include <signal.h>
+#include <stdlib.h>
+
+int running = 0;
+
+void
+sig_handler(int signo)
+{
+    printf("got signal\n");
+    if (signo == SIGINT) {
+        printf("exiting application\n");
+        running = 1;
+    }
+}
+
+int
+main(int argc, char **argv)
+{
+    upm::ES08A *servo = new upm::ES08A(5);
+
+    signal(SIGINT, sig_handler);
+
+    int clock = 0;
+    while (!running) {
+        for (int i = 0; i < 18; i++) {
+            servo->setAngle (clock);
+            clock += 10;
+        }
+
+        for (int i = 0; i < 18; i++) {
+            servo->setAngle (clock);
+            clock -= 10;
+        }
+    }
+
+    std::cout << "exiting application" << std::endl;
+
+    delete servo;
+
+    return 0;
+}
diff --git a/examples/hcsr04.cxx b/examples/hcsr04.cxx
new file mode 100644
index 00000000..4cf454c1
--- /dev/null
+++ b/examples/hcsr04.cxx
@@ -0,0 +1,61 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include "hcsr04.h"
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/time.h>
+
+upm::HCSR04 *sonar = NULL;
+
+void
+sig_handler(int signo)
+{
+    printf("got signal\n");
+    if (signo == SIGINT) {
+        printf("exiting application\n");
+        sonar->m_doWork = 1;
+    }
+}
+
+void
+interrupt (void) {
+    sonar->ackEdgeDetected ();
+}
+
+int
+main(int argc, char **argv)
+{
+    sonar = new upm::HCSR04(5, 7, &interrupt);
+    signal(SIGINT, sig_handler);
+
+    printf ("width = %d\n", sonar->getDistance());
+    std::cout << "exiting application" << std::endl;
+
+    delete sonar;
+
+    return 0;
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87264f59..51edb876 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,3 +5,5 @@ add_subdirectory (buzzer)
 add_subdirectory (ledbar)
 add_subdirectory (4digitdisplay)
 add_subdirectory (nrf24l01)
+add_subdirectory (servo)
+add_subdirectory (hcsr04)
diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt
new file mode 100644
index 00000000..0b40430a
--- /dev/null
+++ b/src/hcsr04/CMakeLists.txt
@@ -0,0 +1,4 @@
+set (libname "hcsr04")
+add_library (hcsr04 SHARED hcsr04.cxx)
+include_directories (${MAA_INCLUDE_DIR})
+target_link_libraries (hcsr04 ${MAA_LIBRARIES})
diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx
new file mode 100644
index 00000000..1eb1054f
--- /dev/null
+++ b/src/hcsr04/hcsr04.cxx
@@ -0,0 +1,94 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+#include <unistd.h>
+#include <stdlib.h>
+#include <functional>
+
+#include "hcsr04.h"
+
+using namespace upm;
+
+HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)) {
+    maa_result_t error  = MAA_SUCCESS;
+    m_name              = "HCSR04";
+
+    m_pwmTriggerCtx     = maa_pwm_init (triggerPin);
+    if (m_pwmTriggerCtx == NULL) {
+        std::cout << "PWM context is NULL" << std::endl;
+        exit (1);
+    }
+
+    maa_init();
+    m_echoPinCtx = maa_gpio_init(echoPin);
+    if (m_echoPinCtx == NULL) {
+        fprintf (stderr, "Are you sure that pin%d you requested is valid on your platform?", echoPin);
+        exit (1);
+    }
+
+    maa_gpio_dir(m_echoPinCtx, MAA_GPIO_IN);
+    gpio_edge_t edge = MAA_GPIO_EDGE_BOTH;
+    maa_gpio_isr (m_echoPinCtx, edge, fptr);
+}
+
+HCSR04::~HCSR04 () {
+    maa_result_t error = MAA_SUCCESS;
+
+    maa_pwm_close (m_pwmTriggerCtx);
+    error = maa_gpio_close (m_echoPinCtx);
+    if (error != MAA_SUCCESS) {
+        maa_result_print (error);
+    }
+}
+
+int
+HCSR04::getDistance () {
+    maa_pwm_enable (m_pwmTriggerCtx, 1);
+    maa_pwm_period_us (m_pwmTriggerCtx, MAX_PERIOD);
+    maa_pwm_pulsewidth_us (m_pwmTriggerCtx, TRIGGER_PULSE);
+    maa_pwm_enable (m_pwmTriggerCtx, 0);
+
+    m_doWork = 0;
+    m_InterruptCounter = 0;
+    while (!m_doWork) {
+        sleep (1);
+    }
+
+    return m_FallingTimeStamp - m_RisingTimeStamp;
+}
+
+void
+HCSR04::ackEdgeDetected () {
+    struct timeval timer;
+    gettimeofday(&timer, NULL);
+
+    ++m_InterruptCounter;
+    if (!(m_InterruptCounter % 2)) {
+        m_FallingTimeStamp  = 1000000 * timer.tv_sec + timer.tv_usec;
+        m_doWork = 1;
+    } else {
+        m_RisingTimeStamp = 1000000 * timer.tv_sec + timer.tv_usec;
+    }
+}
diff --git a/src/hcsr04/hcsr04.h b/src/hcsr04/hcsr04.h
new file mode 100644
index 00000000..f94776c5
--- /dev/null
+++ b/src/hcsr04/hcsr04.h
@@ -0,0 +1,66 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <string>
+#include <maa/aio.h>
+#include <maa/gpio.h>
+#include <maa/pwm.h>
+#include <sys/time.h>
+
+#define HIGH                   1
+#define LOW                    0
+
+#define MAX_PERIOD             7968
+#define TRIGGER_PULSE          10
+
+namespace upm {
+
+class HCSR04 {
+    public:
+        HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void));
+        ~HCSR04 ();
+        int getDistance ();
+        void ackEdgeDetected ();
+
+        uint8_t m_doWork;
+
+        std::string name()
+        {
+            return m_name;
+        }
+
+    private:
+        maa_pwm_context     m_pwmTriggerCtx;
+        maa_gpio_context    m_echoPinCtx;
+
+        uint8_t m_waitEcho;
+        long    m_RisingTimeStamp;
+        long    m_FallingTimeStamp;
+        uint8_t m_InterruptCounter;
+
+        std::string         m_name;
+};
+
+}
diff --git a/src/hcsr04/jsupm_hcsr04.i b/src/hcsr04/jsupm_hcsr04.i
new file mode 100644
index 00000000..808c3779
--- /dev/null
+++ b/src/hcsr04/jsupm_hcsr04.i
@@ -0,0 +1,7 @@
+%module jsupm_hcsr04
+
+%{
+    #include "hcsr04.h"
+%}
+
+%include "hcsr04.h"
diff --git a/src/hcsr04/pyupm_hcsr04.i b/src/hcsr04/pyupm_hcsr04.i
new file mode 100644
index 00000000..175e983f
--- /dev/null
+++ b/src/hcsr04/pyupm_hcsr04.i
@@ -0,0 +1,8 @@
+%module pyupm_hcsr04
+
+%feature("autodoc", "3");
+
+%include "hcsr04.h"
+%{
+    #include "hcsr04.h"
+%}
diff --git a/src/servo/CMakeLists.txt b/src/servo/CMakeLists.txt
new file mode 100644
index 00000000..1bd9e5dc
--- /dev/null
+++ b/src/servo/CMakeLists.txt
@@ -0,0 +1,4 @@
+set (libname "servo")
+add_library (servo SHARED servo.cxx es08a.cxx)
+include_directories (${MAA_INCLUDE_DIR})
+target_link_libraries (servo ${MAA_LIBRARIES})
diff --git a/src/servo/es08a.cxx b/src/servo/es08a.cxx
new file mode 100644
index 00000000..01ecd82b
--- /dev/null
+++ b/src/servo/es08a.cxx
@@ -0,0 +1,39 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+#include <unistd.h>
+
+#include "es08a.h"
+
+using namespace upm;
+
+ES08A::ES08A (int pin) : Servo(pin) {
+    m_name     = "ES08A";
+    m_maxAngle = 180.0;
+}
+
+ES08A::~ES08A() {
+
+}
diff --git a/src/servo/es08a.h b/src/servo/es08a.h
new file mode 100644
index 00000000..c17dbc62
--- /dev/null
+++ b/src/servo/es08a.h
@@ -0,0 +1,40 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <string>
+#include "servo.h"
+
+namespace upm {
+
+#define MIN_PULSE_WIDTH      600
+#define MAX_PULSE_WIDTH      2500
+
+class ES08A : public Servo {
+    public:
+        ES08A (int pin);
+        ~ES08A ();
+};
+
+}
diff --git a/src/servo/jsupm_es08a.i b/src/servo/jsupm_es08a.i
new file mode 100644
index 00000000..00e51d80
--- /dev/null
+++ b/src/servo/jsupm_es08a.i
@@ -0,0 +1,7 @@
+%module jsupm_es08a
+
+%{
+    #include "es08a.h"
+%}
+
+%include "es08a.h"
diff --git a/src/servo/pyupm_es08a.i b/src/servo/pyupm_es08a.i
new file mode 100644
index 00000000..3262ba3b
--- /dev/null
+++ b/src/servo/pyupm_es08a.i
@@ -0,0 +1,8 @@
+%module pyupm_es08a
+
+%feature("autodoc", "3");
+
+%include "es08a.h"
+%{
+    #include "es08a.h"
+%}
diff --git a/src/servo/servo.cxx b/src/servo/servo.cxx
new file mode 100644
index 00000000..c117a9b4
--- /dev/null
+++ b/src/servo/servo.cxx
@@ -0,0 +1,88 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <iostream>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "servo.h"
+
+using namespace upm;
+
+Servo::Servo (int pin) {
+    maa_result_t error = MAA_SUCCESS;
+
+    m_maxAngle        = 180.0;
+    m_servoPin        = pin;
+    m_pwmServoContext = maa_pwm_init (m_servoPin);
+}
+
+Servo::~Servo () {
+
+}
+
+/*
+ * X = between (MIN_PULSE_WIDTH , MAX_PULSE_WIDTH)
+ *
+ * X usec
+ * _______
+ *        |_______________________________________
+ *                      20000 usec
+ *
+ * Max period can be only 7968750(nses) which is ~8(msec)
+ * so the servo wil not work as expected.
+ * */
+maa_result_t Servo::setAngle (int angle) {
+    if (m_pwmServoContext == NULL) {
+        std::cout << "PWM context is NULL" << std::endl;
+        return MAA_ERROR_UNSPECIFIED;
+    }
+
+    maa_pwm_enable (m_pwmServoContext, 1);
+    for (int cycles = 0; cycles < 128; cycles++) {
+        maa_pwm_period_us (m_pwmServoContext, MAX_PERIOD);
+        maa_pwm_pulsewidth_us (m_pwmServoContext, calcPulseTraveling(angle));
+    }
+    maa_pwm_enable (m_pwmServoContext, 0);
+
+    std::cout << "angle = " << angle << " ,pulse = " << calcPulseTraveling(angle) << std::endl;
+}
+
+/*
+ * Calculating relative pulse time to the value.
+ * */
+int Servo::calcPulseTraveling (int value) {
+    // if bigger than the boundaries
+    if (value > m_maxAngle) {
+        return MAX_PULSE_WIDTH;
+    }
+
+    // if less than the boundaries
+    if (value  < 0) {
+        return MIN_PULSE_WIDTH;
+    }
+
+    // the conversion
+    return (int) ((float)MIN_PULSE_WIDTH + ((float)value / m_maxAngle) * ((float)MAX_PULSE_WIDTH - (float)MIN_PULSE_WIDTH));
+}
diff --git a/src/servo/servo.h b/src/servo/servo.h
new file mode 100644
index 00000000..430a4968
--- /dev/null
+++ b/src/servo/servo.h
@@ -0,0 +1,58 @@
+/*
+ * Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <string>
+#include <maa/pwm.h>
+
+namespace upm {
+
+#define MIN_PULSE_WIDTH      600
+#define MAX_PULSE_WIDTH      2500
+#define MAX_PERIOD           7968
+
+#define HIGH                  1
+#define LOW                   0
+
+class Servo {
+    public:
+        Servo (int pin);
+        ~Servo();
+        maa_result_t setAngle (int angle);
+
+        std::string name()
+        {
+            return m_name;
+        }
+    protected:
+        int calcPulseTraveling (int value);
+
+        std::string         m_name;
+        int                 m_servoPin;
+        float               m_maxAngle;
+        maa_pwm_context     m_pwmServoContext;
+        // maa_gpio_context    m_servoPinCtx;
+};
+
+}