diff --git a/.clang-format b/.clang-format
index 8f16c3e..05cfc37 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,9 +6,9 @@ AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
 AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
 AlwaysBreakTemplateDeclarations: true
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: false
@@ -23,11 +23,11 @@ IndentCaseLabels: false
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 20
 PenaltyBreakComment: 60
 PenaltyBreakString: 1000
 PenaltyBreakFirstLessLess: 120
-PenaltyExcessCharacter: 1000000
+PenaltyExcessCharacter: 10
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerBindsToType: false
 SpacesBeforeTrailingComments: 1
diff --git a/.gitignore b/.gitignore
index 51f9455..ba28282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 BuildDir
+site/public/
+.tup/
diff --git a/README.md b/README.md
index f0a3d24..b09540a 100644
--- a/README.md
+++ b/README.md
@@ -3,16 +3,16 @@
 delegates
 =========
 
-small delegate implementation. can be used as header-only library.  
+Small delegate implementation. Can be used as header-only library.  
 To install, just drop in the Delegate.h and include it.
 
 To build & run the examples, you can do a
 
     $ make test
 
-## Why would I want delegates?
+## Why would I use delegates?
 
-This implementation is just a tiny library that is
+This implementation is just a tiny header-only library that is
 
 * Fast
 * Portable C++
@@ -66,7 +66,8 @@ s.notifyDelegate(42);
 
 ## Update
 
-now works also with const member functions!
+* now works also with const member functions!
+* no macros needed anymore!
 
 ## Usage
 
@@ -110,5 +111,8 @@ Further examples can be found in the test directory. To build and execute the te
 
 ## Credits
 
-inspired by the [The Impossibly Fast C++ Delegates](http://www.codeproject.com/Articles/11015/The-Impossibly-Fast-C-Delegates) and [Lightweight Generic C++ Callbacks (or, Yet Another Delegate Implementation)](http://www.codeproject.com/Articles/136799/Lightweight-Generic-C-Callbacks-or-Yet-Another-Del)
+inspired by
+
+* the [The Impossibly Fast C++ Delegates](http://www.codeproject.com/Articles/11015/The-Impossibly-Fast-C-Delegates)
+* and [Lightweight Generic C++ Callbacks (or, Yet Another Delegate Implementation)](http://www.codeproject.com/Articles/136799/Lightweight-Generic-C-Callbacks-or-Yet-Another-Del)