Merge pull request #1 from kraman/master

F18 fixes