Merge pull request #14 from martflu/master

All tests still passing for API version 2014-10-07