Merge pull request #8 from ksv1986/master