Not sure it's correct in 0.1 ... probably won't have time to sort it for 0.2, but have a look at this at some point.