Merge pull request #13 from tkrille/master

code cleanup