Anonymous - 2013-08-26

thx - I see many many changes in your file.
Could you be so kind to split them in different diffs?
I can move sources to github if it helps...