resolved #24 #16
Merge pull request #33 from lob/add-test-cases

resolves #24, resolves #16