Merge changes from adriansonline