Merge pull request #2 from mathis92/master

update2
Merge pull request #2 from mathis92/master

update2
Merge pull request #2 from mathis92/master

update2
update3
Merge origin/master
Merge pull request #7 from GigaWorks/master

update3