Reworked existing functionality to work with latest v20131202 API
0.1.0