linear integration added
Merge branch 'master' of git://github.com/imkevinxu/totoro