Merge pull request #25 from Gedan/BugFixins

Bug fixins
Missed some of the CopyFrom methods
Merge remote-tracking branch 'upstream/master'