Merge pull request #8 from superpatosainz/master

Fixed syntax typo
fix for BlockConcrete
Merge pull request #9 from mysticdrew/master

fix for BlockConcrete
Merge pull request #1 from Universal-Electricity/master

update from upstream