Adding stuff from 1.0.3