Merge PR-80 and one code-style change