bugfix + cosmetic
Merge pull request #7 from kmfdm1/master

bugfix + cosmetic