Removed RJCB stuff he has to fix first
Merge pull request #154 from yurtman/develop

Removed RJCB stuff he has to fix first