Moved away from depricated methods
Merged commits.
Merge remote-tracking branch 'origin/master'