Merge pull request #30 from jmoody/release/1.1.5

Release/1.1.5
Bump version to 1.1.6
Merge pull request #32 from jmoody/release/1.1.6

Release/1.1.6
Merge branch 'master' into develop