Merge pull request #6 from tkrille/master

code cleanup