Merge pull request #45 from paczian/master

minor tweaks