ironing up a bit
Merge pull request #87 from fnordbg/master

ironing up a bit