Final version
Merge branch 'feature'
Merge pull request #52 from SteveLobdell/master

Final changes