updated documentation for 2013, a bit
merged