updated code from other repo
Merge branch 'master' of https://github.com/incephalon/lynx