Pulled changes from master
Merge pull request #32 from CactaurMan36/Board

Pulled changes from master