diff --git a/CHANGES b/CHANGES
index 969e440..bb99706 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.49.2 2014-12-05
+	- [documentation] Improved documentation for various queries (margaretha)
+	- [feature] Added @Experimental support (margaretha)
+	- [feature] Added Eclipse based code formatting (diewald)
+
 0.49.1 2014-11-25
         - [cleanup] Major refactoring for new response messages (diewald)
 	- [cleanup] Removed deprecated error messaging (diewald)
diff --git a/README.md b/README.md
index ae1605e..c5f8518 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,13 @@
 KorAP is available at
 https://korap.ids-mannheim.de/
 
+Description
+-----------
+...
+
 Prerequisites
 -------------
+...
 
 Installation/Starting
 ---------------------
@@ -54,11 +59,16 @@
 
 The maximum value for distance units is 100.
 
-Copyright
----------
+Contribution
+------------
 
-Copyright 2014, IDS Mannheim, Germany
-Authors: Nils Diewald, Eliza Margaretha and contributors.
+
+Before contribution, please reformat your code according to the korap
+style guideline, provided by means of an Eclipse style sheet
+(korap-style.xml). You can either reformat using Eclipse or using Maven
+with the command
+
+  $ mvn java-formatter:format
 
 Citation
 --------
@@ -70,8 +80,16 @@
 
 Named entities annotated in the test data by CoreNLP was done using
 models based on:
-Manaal Faruqui and Sebastian Padó (2010):
-Training and Evaluating a German Named Entity
-Recognizer with Semantic Generalization,
-Proceedings of KONVENS 2010,
-Saarbrücken, Germany
+
+  Manaal Faruqui and Sebastian Padó (2010):
+  Training and Evaluating a German Named Entity
+  Recognizer with Semantic Generalization,
+  Proceedings of KONVENS 2010,
+  Saarbrücken, Germany
+
+Copyright and License
+---------------------
+
+Copyright 2014, IDS Mannheim, Germany
+
+Authors: Nils Diewald, Eliza Margaretha, and contributors.
\ No newline at end of file
diff --git a/korap-style.xml b/korap-style.xml
index 1855263..a02ad23 100644
--- a/korap-style.xml
+++ b/korap-style.xml
@@ -4,6 +4,12 @@
     <setting
 	id="org.eclipse.jdt.core.compiler.source"
 	value="1.7"/>
+    <setting
+	id="org.eclipse.jdt.core.compiler.compliance"
+	value="1.7"/>
+    <setting
+	id="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
+	value="1.7"/>
     
     <!-- Global rules -->
     <setting
@@ -25,40 +31,32 @@
 	id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body"
 	value="true"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body"
-	value="do not insert"/><!-- This differs from default -->
-
-
-
+	id="org.eclipse.jdt.core.formatter.tabulation.size"
+	value="4"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
-	value="insert"/>
-
-    <!-- Respect semicolons -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources"
+	id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block"
-	value="do not insert"/><!-- This differs from default -->
+	id="org.eclipse.jdt.core.formatter.indent_empty_lines"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve"
+	value="1"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.line_length"
+	value="70"/><!-- This differs from the default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block"
+	value="true"/>
 
     <!-- Spaces around parens -->
     <setting
@@ -139,18 +137,131 @@
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
 	value="insert"/>
-
-    <!-- Unary operators -->
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator"
-	value="do not insert"/>
-
-    <!-- Binary operators -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block"
+	value="do not insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch"
 	value="insert"/>
 
     <!-- Spaces around commas -->
@@ -199,13 +310,148 @@
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments"
 	value="insert"/>
-
-    <!-- Annotations -->
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
+	value="do not insert"/>
+
+    <!-- Spaces around semicolons -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
+	value="insert"/>
+
+    <!-- Spaces around colons -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for"
+	value="insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert"
+	value="insert"/>
+
+
+    <!-- Unary operators -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator"
+	value="do not insert"/>
+
+    <!-- Binary operators -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator"
+	value="true"/>
+
+    <!-- Annotation blocks -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
 	value="insert"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
@@ -214,28 +460,20 @@
 	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
-	value="insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation"
 	value="do not insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
-	value="insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
 	value="do not insert"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
 	value="do not insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
+	id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
 	value="insert"/>
-
-    <!-- Fields -->
     <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields"
-	value="16"/> <!-- ??? -->
+	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
+	value="0"/>
 
     <!-- Blank lines -->
     <setting
@@ -262,47 +500,129 @@
     <setting
 	id="org.eclipse.jdt.core.formatter.blank_lines_before_method"
 	value="1"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
+	value="0"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations"
+	value="1"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.blank_lines_before_imports"
+	value="1"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups"
+	value="1"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.blank_lines_after_imports"
+	value="1"/>
 
-    <!-- Loops -->
+    <!-- New lines -->
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
 	value="do not insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for"
-	value="insert"/><!-- This differs from default -->
-
-    <!-- Angle brackets -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
-	value="do not insert"/>
-
-    <!-- switch/case -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
-	value="true"/><!-- This differs from default! -->
-
-    <!-- Conditional -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional"
-	value="insert"/>
-
-    <!-- Comments -->
-    <setting
 	id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries"
 	value="true"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter"
 	value="insert"/>
     <setting
+	id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement"
+	value="insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
+	value="insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
+	value="insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_label"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body"
+	value="do not insert"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing"
+	value="do not insert"/><!-- doesn't seem to work -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line"
+	value="false"/><!-- This differs from the default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
+	value="insert"/>
+
+    <!-- switch/case blocks -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
+	value="true"/><!-- This differs from default -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
+	value="true"/>
+
+    <!-- Conditional blocks -->
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional"
+	value="insert"/>
+
+    <!-- Comment blocks -->
+    <setting
 	id="org.eclipse.jdt.core.formatter.comment.format_line_comments"
 	value="true"/>
     <setting
@@ -314,12 +634,33 @@
     <setting
 	id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
 	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.join_lines_in_comments"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.format_html"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.format_source_code"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.format_header"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
+	value="false"/>
 
     <!-- if/else blocks -->
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement"
-	value="insert"/><!-- This differs from default! -->
-    <setting
 	id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
 	value="false"/>
     <setting
@@ -329,37 +670,31 @@
 	id="org.eclipse.jdt.core.formatter.compact_else_if"
 	value="true"/>
 
-    <!-- try/catch/finally -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
-	value="insert"/><!-- This differs from default! -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
-	value="insert"/><!-- This differs from default! -->
+    <!-- try/catch/finally blocks -->
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try"
 	value="do not insert"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try"
 	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
+	value="do not insert"/>
 
     <!-- No opinion/idea here -->
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
 	value="insert"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
-	value="insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.disabling_tag"
 	value="@formatter:off"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration"
 	value="end_of_line"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
-	value="do not insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.use_on_off_tags"
 	value="false"/>
     <setting
@@ -411,9 +746,6 @@
 	id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation"
 	value="16"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration"
-	value="insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
 	value="do not insert"/>
     <setting
@@ -438,14 +770,12 @@
 	id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line"
 	value="false"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast"
+	value="do not insert"/>
     <setting
 	id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration"
 	value="16"/>
     <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement"
-	value="insert"/>
-    <setting
 	id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
 	value="end_of_line"/>
     <setting
@@ -475,145 +805,92 @@
     <setting
 	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
 	value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-    <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-    <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-    <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-    <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-    <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-    <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-    <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-    <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer"
+	value="2"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line"
+	value="false"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"
+	value="enabled"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_compact_if"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter"
+	value="insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator"
+	value="do not insert"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try"
+	value="80"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
+	value="0"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields"
+	value="16"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration"
+	value="end_of_line"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
+	value="true"/>
+    <setting
+	id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
+	value="false"/>
   </profile>
 </profiles>
diff --git a/pom.xml b/pom.xml
index c0ff229..8bf1d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,19 +4,26 @@
 
   <!--
       ** Indexer
-      install the indexer and the performancetests
+      # install the indexer
       $ mvn clean compile assembly:single
-      Then run e.g.
-      $ java -jar target/KorAP-lucene-index-X.XX.jar src/main/resources/korap.conf /data/hdd/lucene-new/WPD/
+      # Then run e.g.
+      $ java -jar target/KorAP-lucene-index-X.XX.jar
+             src/main/resources/korap.conf
+             /data/hdd/lucene-new/WPD/
 
       ** Server
-      Start the server with
-      $mvn clean compile exec:java
+      # Start the server with
+      $ mvn clean compile exec:java
+
+      ** Formatter
+      # Format the code with
+      $ mvn java-formatter:format
+
   -->
 
   <groupId>KorAP-modules</groupId>
   <artifactId>KorAP-lucene-index</artifactId>
-  <version>0.49.1</version>
+  <version>0.49.2</version>
   <packaging>jar</packaging>
 
   <name>KorAP-lucene-index</name>
@@ -238,10 +245,9 @@
         </configuration>
       </plugin> 
 
-      <!-- Formatter plugin for Eclipse based coding conventions -->
       <!--
+	  Formatter plugin for Eclipse based coding conventions
 	  http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html
-	  Call: mvn java-formatter:format
       -->
       <plugin>
         <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
@@ -254,15 +260,6 @@
 	  <compilerCompliance>1.7</compilerCompliance>
 	  <compilerTargetPlatform>1.7</compilerTargetPlatform>
 	</configuration>
-	<!--
-	<executions>
-          <execution>
-            <goals>
-              <goal>format</goal>
-            </goals>
-          </execution>
-        </executions>
-	-->
       </plugin>
 
       <plugin>