Fixed issue #6 - added the code, specs and some spec helper code