Merge pull request #49 from borti4938/develop

Update for PIC-IGR code
Merge remote-tracking branch 'mrehkopf/develop' into develop