Updated changelog
Merge pull request #17 from cconover/dev

Updated changelog