some updates
fixes
Merge pull request #7 from scopatz/master

some updates