Changes from Martin Hirzel <hirzel@gmail.com>