adding more changes
Merge branch 'master' of https://github.com/sr5/na