merge from PR #179
merge from PR #179

PIC123/SCAMP,PIC123/SCAMP,shekr/SCAMP,CodeFluent/SCAMP,brentstineman/SCAMP,PIC123/SCAMP,brentstineman/SCAMP,shekr/SCAMP,brentstineman/SCAMP,zbrad/SCAMP,shekr/SCAMP,zbrad/SCAMP,zbrad/SCAMP,CodeFluent/SCAMP,CodeFluent/SCAMP,brentstineman/SCAMP,shekr/SCAMP,CodeFluent/SCAMP,PIC123/SCAMP,zbrad/SCAMP