Completed issue # 216.

Issue 216 completed, including qUnit test coverage.