Merge pull request #9 from delasky/working

Merge pull request #8 from delasky/master
Merge pull request #10 from delasky/master

Merge pull request #9 from delasky/working