added compile options
reindented
fix #1
Merge branch 'b1'