Development - Merge latest development branch for Issue #42

Fixed a couple of failing specs.