Latest source code based on Version 1.0.7