Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
rename function to better fit into naming scheme
remove default binding of cache path
Merge pull request #69 from mikey179/master

more work for 3.1.0