Pulling In Changes

Bringing my fork up to date with changes from raynes.