api tweaks
api changes Merge branch 'master' of https://github.com/chopstickninja/stocky