Merge pull request #8 from mschristiansen/v1.4