one of these days
Merge pull request #7 from lisali567/fixes

one of these days