Merge pull request #24 from kakulisen/distribution

SCB-1458 add settings for distribution