Merge pull request #1 from burnbright/master

from burnbright master to my master