a few fixes
Merge pull request #7 from ellipseit/patch-1

a few fixes