Moved the "using namespace std" to the correct place.
Unit test exposed a mistake in the key masks!
Some problems with the gctest have been exposed. Temporarily eliminated.
Merge branch 'development'