Merge pull request #6 from Bazay/master

Updates
Merge remote-tracking branch 'upstream/master'