Adding stuff back
Adding stuff back
Adding stuff back
Adding stuff back
Adding stuff back - revert to Java 6
Adding stuff back - refactoring
Adding stuff back - refactoring
Adding stuff back - refactoring
Adding stuff back - refactoring
Adding stuff back - copyright
Adding stuff back - copyright