Version update

Version update for terribl and bdavenport's combined changes