Merge pull request #119 from olerem/rate-2016.12.16.1