new commit by ww933
Merge pull request #13 from Chianti5/master

new commit by ww933