new code
Merge pull request #1 from bakedraccoon/dev

new base code