closes #101
Merge branch 'dev' into XCBoard
Merge branch 'XCBoard' into XCBoardIterator