Merged in changes from master - bug fixes