Prepare #1 for 0.3.1