Merged and added comments. Henrik Andrée