Added uncommiitted changes from 0.9.3

Release 0.9.3 has changes that weren't added to the repository on Google Code.