synced with offline development
Merge pull request #1 from kentandersen/master

synced with offline development