NPE
Missed layout from default template
Merge pull request #11 from shafirov/master

Couple of bugs in latest pull fixed