cleaned up
Merge branch 'master' of https://github.com/bgossele/CSDS_button