Merging 2

Updating my fork.