2013-06-15 - Jonathan Morgan - bug fixes and additional convenience methods.