Merge pull request #1 from ninjablocks/master

Merge ninja-zigbee's changes