Update 18112013. aspect_map now is thread-safe

aspect_map now is thread-safe and others fixes...