1.4.x problems
Merge pull request #62 from davghouse/develop

1.4.x problems