Merge pull request #3 from zyxxy/Trunk

Merging changes
Merge pull request #4 from zyxxy/master

test