Minor bugfix and incremental build integrated version of #24.