tweaks
Merge pull request #45 from Randgalt/master

tweaks