Merge pull request #2 from yinia/master

second commit
Merge remote-tracking branch 'aidenchi/master'
fourth commit