add
add
add
fix
add other blocks
Merge pull request #1 from fanian/master

ok