Merge pull request #1 from sqweebking/master

Sync
Merge pull request #16 from mikeder/master

Merge pull request #1 from sqweebking/master