Some changes in public API, and seems to broken indent in sources :(