Added some block stuff
Merge branch 'master' of github.com:devonmeyer/amio