Bug 675

https://gist.github.com/jchrusciel/c558836f1dd65ee94a53

Summary: Added tests and caching to get_data function, also merged with origin