updates
Merge pull request #10 from maseh87/tests

updates