marsqing Merge pull request #9 from micwoj92/master