update in 9.28.2014

make some changes
made 2nd change

yes i madke again
Merge pull request #1 from LitleCarl/location

Location merged 2 master