jdk

ab936267 - Added assert, comments and used templates