Modified to clean up spec and comments
Merge pull request #10 from mdsol/fix/clean_spec

Modified to clean up spec and comments