Merge for Dec2014 release

Merge for Dec2014 release
Includes fixes for #106, #110, #111