EmilyOng Merge pull request #2 from llaske/master