Merge pull request #1 from gracefully/dev

Dev
Merge pull request #2 from gracefully/master

Merge pull request #1 from gracefully/dev