Merge pull request #1 from nicklondhe/master

update 1409