Documentation
Fixed NPEs #76