merged with original project's trunk
latest version merged on 20131013