Speed improvements (see #42)
Merge branch '1.2'