config-r/config-r — pull request #175 by adamralph (2014-06-16 12:21:42+00:00)
Title: merge dev to master

#167