diff --git a/docs/max31855.md b/docs/max31855.md
index c78b634d..66ee2141 100644
--- a/docs/max31855.md
+++ b/docs/max31855.md
@@ -31,7 +31,8 @@ change between the javascript & node.js one is the argument to %module.
 The %include parameter defines which functions will be available to the
 node/python module created, Whilst the headers inside %{} will be explicitly
 required during compilation. Typically only the top level header is required in
-either of those args.
+either of those args. The upm.i is just a shortcut to include some commonly
+used swig wrappers for UPM sensors, it's not obligatory but recommended.
 
 ### API
 
diff --git a/src/buzzer/jsupm_buzzer.i b/src/buzzer/jsupm_buzzer.i
index b85f008a..d957892e 100644
--- a/src/buzzer/jsupm_buzzer.i
+++ b/src/buzzer/jsupm_buzzer.i
@@ -1,4 +1,5 @@
 %module jsupm_buzzer
+%include "../upm.i"
 
 %{
     #include "buzzer.h"
diff --git a/src/buzzer/pyupm_buzzer.i b/src/buzzer/pyupm_buzzer.i
index 2bdfe12b..dca5182f 100644
--- a/src/buzzer/pyupm_buzzer.i
+++ b/src/buzzer/pyupm_buzzer.i
@@ -1,4 +1,5 @@
 %module pyupm_buzzer
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/grove/jsupm_grove.i b/src/grove/jsupm_grove.i
index 97a17c25..b1f9e7dd 100644
--- a/src/grove/jsupm_grove.i
+++ b/src/grove/jsupm_grove.i
@@ -1,4 +1,5 @@
 %module jsupm_grove
+%include "../upm.i"
 
 %{
     #include "grove.h"
diff --git a/src/grove/pyupm_grove.i b/src/grove/pyupm_grove.i
index abb4c43c..515149c1 100644
--- a/src/grove/pyupm_grove.i
+++ b/src/grove/pyupm_grove.i
@@ -1,4 +1,5 @@
 %module pyupm_grove
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/gy65/jsupm_gy65.i b/src/gy65/jsupm_gy65.i
index ac5cba66..a3deba3a 100644
--- a/src/gy65/jsupm_gy65.i
+++ b/src/gy65/jsupm_gy65.i
@@ -1,4 +1,5 @@
 %module jsupm_gy65
+%include "../upm.i"
 
 %{
     #include "gy65.h"
diff --git a/src/gy65/pyupm_gy65.i b/src/gy65/pyupm_gy65.i
index f2e134f1..3086cd4f 100644
--- a/src/gy65/pyupm_gy65.i
+++ b/src/gy65/pyupm_gy65.i
@@ -1,4 +1,5 @@
 %module pyupm_gy65
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/hcsr04/jsupm_hcsr04.i b/src/hcsr04/jsupm_hcsr04.i
index 808c3779..f86bd1b1 100644
--- a/src/hcsr04/jsupm_hcsr04.i
+++ b/src/hcsr04/jsupm_hcsr04.i
@@ -1,4 +1,5 @@
 %module jsupm_hcsr04
+%include "../upm.i"
 
 %{
     #include "hcsr04.h"
diff --git a/src/hcsr04/pyupm_hcsr04.i b/src/hcsr04/pyupm_hcsr04.i
index 175e983f..8482a937 100644
--- a/src/hcsr04/pyupm_hcsr04.i
+++ b/src/hcsr04/pyupm_hcsr04.i
@@ -1,4 +1,5 @@
 %module pyupm_hcsr04
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/hmc5883l/jsupm_hmc5883l.i b/src/hmc5883l/jsupm_hmc5883l.i
index 25662d0f..1735f17a 100644
--- a/src/hmc5883l/jsupm_hmc5883l.i
+++ b/src/hmc5883l/jsupm_hmc5883l.i
@@ -1,4 +1,5 @@
 %module jsupm_hmc5883l
+%include "../upm.i"
 
 %{
     #include "hmc5883l.h"
diff --git a/src/hmc5883l/pyupm_hmc5883l.i b/src/hmc5883l/pyupm_hmc5883l.i
index c50a90e8..999d1647 100644
--- a/src/hmc5883l/pyupm_hmc5883l.i
+++ b/src/hmc5883l/pyupm_hmc5883l.i
@@ -1,4 +1,5 @@
 %module pyupm_hmc5883l
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/lcd/jsupm_i2clcd.i b/src/lcd/jsupm_i2clcd.i
index f9660246..44050657 100644
--- a/src/lcd/jsupm_i2clcd.i
+++ b/src/lcd/jsupm_i2clcd.i
@@ -1,4 +1,5 @@
 %module jsupm_i2clcd
+%include "../upm.i"
 
 %include "i2clcd.h"
 %{
diff --git a/src/lcd/pyupm_i2clcd.i b/src/lcd/pyupm_i2clcd.i
index d920680c..3c94e124 100644
--- a/src/lcd/pyupm_i2clcd.i
+++ b/src/lcd/pyupm_i2clcd.i
@@ -1,4 +1,5 @@
 %module pyupm_i2clcd
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/max31855/jsupm_max31855.i b/src/max31855/jsupm_max31855.i
index a136948b..6bb69673 100644
--- a/src/max31855/jsupm_max31855.i
+++ b/src/max31855/jsupm_max31855.i
@@ -1,5 +1,6 @@
 //! [Interesting]
 %module jsupm_max31855
+%include "../upm.i"
 
 %{
     #include "max31855.h"
diff --git a/src/max31855/pyupm_max31855.i b/src/max31855/pyupm_max31855.i
index a0fe90dd..1d4cc2a3 100644
--- a/src/max31855/pyupm_max31855.i
+++ b/src/max31855/pyupm_max31855.i
@@ -1,4 +1,5 @@
 %module pyupm_max31855
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/max44000/jsupm_max44000.i b/src/max44000/jsupm_max44000.i
index c3dc7a65..80a2b5a8 100644
--- a/src/max44000/jsupm_max44000.i
+++ b/src/max44000/jsupm_max44000.i
@@ -1,4 +1,5 @@
 %module jsupm_max44000
+%include "../upm.i"
 
 %{
     #include "max44000.h"
diff --git a/src/max44000/pyupm_max44000.i b/src/max44000/pyupm_max44000.i
index 4ed0c778..cd7ff179 100644
--- a/src/max44000/pyupm_max44000.i
+++ b/src/max44000/pyupm_max44000.i
@@ -1,4 +1,5 @@
 %module pyupm_max44000
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/mic/jsupm_mic.i b/src/mic/jsupm_mic.i
index 2edbdbc3..0e72ac52 100644
--- a/src/mic/jsupm_mic.i
+++ b/src/mic/jsupm_mic.i
@@ -1,4 +1,5 @@
 %module jsupm_mic
+%include "../upm.i"
 
 %{
     #include "mic.h"
diff --git a/src/mic/pyupm_mic.i b/src/mic/pyupm_mic.i
index 2cf9be9c..8682b2ad 100644
--- a/src/mic/pyupm_mic.i
+++ b/src/mic/pyupm_mic.i
@@ -1,4 +1,5 @@
 %module pyupm_mic
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/mma7455/jsupm_mma7455.i b/src/mma7455/jsupm_mma7455.i
index bfa234bf..3ec5f132 100644
--- a/src/mma7455/jsupm_mma7455.i
+++ b/src/mma7455/jsupm_mma7455.i
@@ -1,4 +1,5 @@
 %module jsupm_mma7455
+%include "../upm.i"
 
 %{
     #include "mma7455.h"
diff --git a/src/mma7455/pyupm_mma7455.i b/src/mma7455/pyupm_mma7455.i
index cfa8377f..bb04829b 100644
--- a/src/mma7455/pyupm_mma7455.i
+++ b/src/mma7455/pyupm_mma7455.i
@@ -1,4 +1,5 @@
 %module pyupm_mma7455
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/mpu9150/jsupm_mpu9150.i b/src/mpu9150/jsupm_mpu9150.i
index 3c19e2b0..d67a3834 100644
--- a/src/mpu9150/jsupm_mpu9150.i
+++ b/src/mpu9150/jsupm_mpu9150.i
@@ -1,4 +1,5 @@
 %module jsupm_mpu9150
+%include "../upm.i"
 
 %{
     #include "mpu9150.h"
diff --git a/src/mpu9150/pyupm_mpu9150.i b/src/mpu9150/pyupm_mpu9150.i
index 71c8afe3..f8d13297 100644
--- a/src/mpu9150/pyupm_mpu9150.i
+++ b/src/mpu9150/pyupm_mpu9150.i
@@ -1,4 +1,5 @@
 %module pyupm_mpu9150
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/my9221/jsupm_my9221.i b/src/my9221/jsupm_my9221.i
index 937f9713..77cf0e0b 100644
--- a/src/my9221/jsupm_my9221.i
+++ b/src/my9221/jsupm_my9221.i
@@ -1,4 +1,5 @@
 %module jsupm_my9221
+%include "../upm.i"
 
 %{
     #include "my9221.h"
diff --git a/src/my9221/pyupm_my9221.i b/src/my9221/pyupm_my9221.i
index d28bc201..c442b233 100644
--- a/src/my9221/pyupm_my9221.i
+++ b/src/my9221/pyupm_my9221.i
@@ -1,4 +1,5 @@
 %module pyupm_my9221
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/nrf24l01/jsupm_nrf24l01.i b/src/nrf24l01/jsupm_nrf24l01.i
index 0e66e82d..2be49ab0 100644
--- a/src/nrf24l01/jsupm_nrf24l01.i
+++ b/src/nrf24l01/jsupm_nrf24l01.i
@@ -1,4 +1,5 @@
 %module jsupm_nrf24l01
+%include "../upm.i"
 
 %{
     #include "nrf24l01.h"
diff --git a/src/nrf24l01/pyupm_nrf24l01.i b/src/nrf24l01/pyupm_nrf24l01.i
index 433c6550..0290cdd1 100644
--- a/src/nrf24l01/pyupm_nrf24l01.i
+++ b/src/nrf24l01/pyupm_nrf24l01.i
@@ -1,4 +1,5 @@
 %module pyupm_nrf24l01
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/pulsensor/jsupm_pulsensor.i b/src/pulsensor/jsupm_pulsensor.i
index ff6d49d3..d92312a5 100644
--- a/src/pulsensor/jsupm_pulsensor.i
+++ b/src/pulsensor/jsupm_pulsensor.i
@@ -1,4 +1,5 @@
 %module jsupm_pulsensor
+%include "../upm.i"
 
 %{
     #include "pulsensor.h"
diff --git a/src/pulsensor/pyupm_pulsensor.i b/src/pulsensor/pyupm_pulsensor.i
index cece2b0f..9ee9a522 100644
--- a/src/pulsensor/pyupm_pulsensor.i
+++ b/src/pulsensor/pyupm_pulsensor.i
@@ -1,4 +1,5 @@
 %module pyupm_pulsensor
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/servo/jsupm_servo.i b/src/servo/jsupm_servo.i
index affb34dc..8b630f83 100644
--- a/src/servo/jsupm_servo.i
+++ b/src/servo/jsupm_servo.i
@@ -1,4 +1,5 @@
 %module jsupm_servo
+%include "../upm.i"
 
 %{
     #include "servo.h"
diff --git a/src/servo/pyupm_servo.i b/src/servo/pyupm_servo.i
index c9ca7634..f8f50856 100644
--- a/src/servo/pyupm_servo.i
+++ b/src/servo/pyupm_servo.i
@@ -1,4 +1,5 @@
 %module pyupm_servo
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/st7735/jsupm_st7735.i b/src/st7735/jsupm_st7735.i
index 047d9d44..e4291e4b 100644
--- a/src/st7735/jsupm_st7735.i
+++ b/src/st7735/jsupm_st7735.i
@@ -1,4 +1,5 @@
 %module jsupm_st7735
+%include "../upm.i"
 
 %{
     #include "st7735.h"
diff --git a/src/st7735/pyupm_st7735.i b/src/st7735/pyupm_st7735.i
index 6190b7b2..a709542b 100644
--- a/src/st7735/pyupm_st7735.i
+++ b/src/st7735/pyupm_st7735.i
@@ -1,4 +1,5 @@
 %module pyupm_st7735
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/stepmotor/jsupm_stepmotor.i b/src/stepmotor/jsupm_stepmotor.i
index cfadbcec..9cea2ec0 100644
--- a/src/stepmotor/jsupm_stepmotor.i
+++ b/src/stepmotor/jsupm_stepmotor.i
@@ -1,4 +1,5 @@
 %module jsupm_stepmotor
+%include "../upm.i"
 
 %{
     #include "stepmotor.h"
diff --git a/src/stepmotor/pyupm_stepmotor.i b/src/stepmotor/pyupm_stepmotor.i
index 4c236c4a..e9ed6db5 100644
--- a/src/stepmotor/pyupm_stepmotor.i
+++ b/src/stepmotor/pyupm_stepmotor.i
@@ -1,4 +1,5 @@
 %module pyupm_stepmotor
+%include "../upm.i"
 
 %include "stdint.i"
 
diff --git a/src/tm1637/jsupm_tm1637.i b/src/tm1637/jsupm_tm1637.i
index 6a3edeaf..eaa7efa0 100644
--- a/src/tm1637/jsupm_tm1637.i
+++ b/src/tm1637/jsupm_tm1637.i
@@ -1,4 +1,5 @@
 %module jsupm_tm1637
+%include "../upm.i"
 
 %{
     #include "tm1637.h"
diff --git a/src/tm1637/pyupm_tm1637.i b/src/tm1637/pyupm_tm1637.i
index ff6cd6f1..f29da62d 100644
--- a/src/tm1637/pyupm_tm1637.i
+++ b/src/tm1637/pyupm_tm1637.i
@@ -1,4 +1,5 @@
 %module pyupm_tm1637
+%include "../upm.i"
 
 %feature("autodoc", "3");
 
diff --git a/src/upm.i b/src/upm.i
new file mode 100644
index 00000000..00fbad5e
--- /dev/null
+++ b/src/upm.i
@@ -0,0 +1,3 @@
+%include "std_string.i"
+
+%typemap(out) mraa_result_t = int;