Merge pull request #4 from BusProject/master

Additional Block Fixes
Contests are defined
Merge radical master