Initial Commit
Merge https://github.com/gcganley/bjarne