Commit 709a4854e987d38124a587d3f6f78264a38bbe49

Kentaro Fukuchi 2011-10-17T18:54:56

Various bug fixes. (Thanks to Adam Shepherd)