Format & filename fix
Refactoring, add hook option
Test for exception
Merge pull request #9 from Antek88/master

Refactoring, add hook option