Code: Updated to latest master and fixed a test.
Merge pull request #455 from am11/master

Code: Updated to latest master and fixed a test