Pull #2 - from greenfieldtech-nirs

Additional stubs are now in master branch, still missing the actual functionality here :-(