new buttons
links update
Merge pull request #1 from psyfako/master

unify forks