Porting lots of functions
Merge branch 'gh-pages'