Graph-search
Merge branch 'master' of heroku.com:fscan
More fixes
Merge branch 'master' of heroku.com:fscan