Added some changes to support using Redstone 0.0.5
Merge branch 'feature/latest-redstone-api'