Updated with bug fixes

Updated with the bug fixes specified in the articles