Updated for 10.10 and higher compatibility.
Merge pull request #1 from snielsen/master

Updated for 10.10 and higher compatibility.