some polish
Merge pull request #12 from blaw711/develop

some polish