Merge pull request #4 from AaronBottegal/master

Fix dumb stuff 2.0
Keep .cbp file.