Merge pull request #7 from wzin/master

asdasd asd