barosl Merge branch 'repo'

Original pull request: #118

Latest commit 2104e4b

Jan 18, 2016