1.2.x problems
Merge pull request #60 from davghouse/develop

1.2.x problems