Added configure.ac requested in #50
Merge branch 'working-tree' into develop