Extends DefaultConfiguration #36
Merge pull request #38 from marek-surek/master

Extends DefaultConfiguration #36