Code Cleanup
Merge branch 'master' of https://github.com/beebotte/bbt_dotnet