Merge pull request #8 from delasky/master

merging down
Merge pull request #9 from delasky/working

Merge pull request #8 from delasky/master