Merge pull request #2 from rangerofthewest/master

Mergetime