Merge pull request #15 from macGRID-SRN/Dev

Dev
Merge pull request #16 from macGRID-SRN/Dev

Dev
Merge pull request #17 from macGRID-SRN/Dev

changes for the pi
Merge pull request #19 from macGRID-SRN/Dev

Dev
Merge pull request #20 from macGRID-SRN/Dev

Dev
added callback