Merge pull request #1 from loganlinn/master

Additional progress