Merge pull request #1 from stevieflow/master

Updated