Merge pull request #23 from netputer/master

Polish