changed GPIO from 18 to 12
Merge branch 'marcobrianza-patch-1'