Some changes
Merge pull request #8 from edwinofsakh/test

Some changes