cjd merged crashey into master, yey