Merge pull request #224 from menny/master

Various commits for milestone 112-114.