Replace diamond operator to make it Java 6 compatible
Change source compatibility to 1.6 and increment version
Cast null arguments in varargs calls to prevent warning