diff --git a/examples/c++/pulsensor.cxx b/examples/c++/pulsensor.cxx
index 196d7047..2c0a9caa 100644
--- a/examples/c++/pulsensor.cxx
+++ b/examples/c++/pulsensor.cxx
@@ -28,7 +28,6 @@
 #include <signal.h>
 
 int doWork = 0;
-pulsensor_context sensor_ctx;
 
 void
 sig_handler(int signo)
@@ -49,13 +48,13 @@ int
 main(int argc, char **argv)
 {
 //! [Interesting]
-    init_pulsensor (&sensor_ctx, handler);
+    Pulsensor *sensor = new Pulsensor(handler);
     
-    start_sampler (&sensor_ctx);
+    sensor->start_sampler();
     while (!doWork) {
         usleep (5);
     }
-    stop_sampler (&sensor_ctx);
+    sensor->stop_sampler();
 //! [Interesting]
     return 0;
 }
diff --git a/src/pulsensor/pulsensor.cxx b/src/pulsensor/pulsensor.cxx
index 3d933aac..433b8169 100644
--- a/src/pulsensor/pulsensor.cxx
+++ b/src/pulsensor/pulsensor.cxx
@@ -46,7 +46,6 @@ Pulsensor::Pulsensor (Callback *obj_call) : pin_ctx(0)
     bpm            = 0;
     qs             = FALSE;
     apmlitude      = 100;
-
 }
 #else
 Pulsensor::Pulsensor (callback_handler handler) : pin_ctx(0)
@@ -79,7 +78,7 @@ void Pulsensor::start_sampler ()
 }
 
 void Pulsensor::stop_sampler () {
-    Pulsensor::ctx_counter--;
+    ctx_counter--;
 }
 
 void *Pulsensor::do_sample (void *arg) {
@@ -88,7 +87,7 @@ void *Pulsensor::do_sample (void *arg) {
 
     Pulsensor *pulsensor = static_cast<Pulsensor *>(arg);
 
-    while (Pulsensor::ctx_counter) {
+    while (pulsensor->ctx_counter) {
         data_from_sensor = pulsensor->pin_ctx.read ();
         pulsensor->ret = FALSE;
 
diff --git a/src/pulsensor/pulsensor.h b/src/pulsensor/pulsensor.h
index 3bf26df5..c82a1412 100644
--- a/src/pulsensor/pulsensor.h
+++ b/src/pulsensor/pulsensor.h
@@ -118,6 +118,6 @@ private:
 #else
     callback_handler callback; /**< The callback function */
 #endif
-    static volatile uint16_t ctx_counter;
+    volatile uint16_t ctx_counter;
 };