Merge pull request #11 from tkrille/master

code cleanup