Merge pull request #25 from sunny-g/master

fixed cardboard merge issues
Merge pull request #26 from ONYX-CRAB/dev

Dev