recent updates
pull from master
added_erb
updates
Merge pull request #59 from oafridi/cb_bugfixes

Cb bugfixes