merge develop -D org -I include -E exclude: PR 351 (Add SPW support to FakeReader)
merge develop -D org -I include -E exclude: PR 380 (Removing ndpi from readers list for fs demo)