Merge with 1dd63a32ffc486b71399045cf8443ec6ac9d7bf5

refactored sources

fixed pointer fail

(0) -10 -3 +3 +10 +30 tip

mercurial