Merge pull request #8 from celil-kj/master