Merge pull request #1 from JuSay/master

Master