Update to CB 1.6.1-R0.1

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Name NPC correctly

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Merge pull request #17 from simplyianm/master

Update to 1.6.1-R0.1
Thanks.