Merge pull request #3 from mrquincle/master

Board and bugs
Merge remote-tracking branch 'upstream/master'