0.1.0.24, merging into master