Merged first three pull requests