Merge pull request #175 from tzumainn/master

Added additional tests