Merge pull request #16 from jelitox/master