Version 1.3, minor code modifications