- Removed diamond operators to ensure Java 1.6 compatibility
- Made "run-bonus" build target depend on "compile" build target