Testbranch

see issue #27 for brief

I cannot test the whole activity at the moment but fix for NPE seems to be working

Have a look when you can 

Will debug if needed