Merge pull request #3 from mathis92/master

update
Merge pull request #8 from GigaWorks/master

Merge pull request #3 from mathis92/master