bug fix one hit
Merge pull request #41 from delasky/danielworking

bug fix one hit
Merge pull request #42 from delasky/master

bug fix go live