merged library from branches/i-campbell to trunk. now version 0.0.0.10
Started merging branches/i-campbell back into trunk