Merge pull request #6 from b0nk/master

code clean up