Passing basic unit tests
Passing more unit tests
Changes in response to code review
Merge pull request #1 from seomoz/hc-9

HC-9