Merge pull request #120 from kashjs/master

more tests added