Sync updates
Merge pull request #15 from wiredearp/master

Sync updates