Merge pull request #177 from paczian/master

cleanup