closes #101
Merge branch 'dev' into XCBoard