Merge pull request #1 from ryanhamshire/master

get latest changes