More polishing
Merge pull request #267 from mentatzoe/master

More polishing