tmp-1-4-button-and-refactoring

Contains changes from https://github.com/psycholold/SensorReader/pull/7
and https://github.com/psycholold/SensorReader/pull/8 and thus making
them obsolete.

Used to fix merge conflicts when merging.