Merging forks/branches.
Cleaned up files.