Fix issue #123: override 'boilerplate' was done too late
Merge pull request #138 from dirkfeytons/master

Fix issue #123: override 'boilerplate' was done too late