Merge remote-tracking branch 'rmanola/master' (Closes: #124)