Pull #2 - NirS to Master