Merge pull request #27 from annsonn/feature/fixBoard

Feature/fix board