Merge NickFane branch into Master branch