Properties and header configuraiton
Merged with master