Merge pull request #17 from delasky/master

merg
Merge pull request #18 from delasky/newdaniel

Merge pull request #17 from delasky/master