Scalar 2015
Merge pull request #241 from adamw/patch-1

Scalar 2015