remove forward following for speed, rescue additional errors
Merge branch 'master' of https://github.com/ddzoan/swapp