Merge pull request #1 from arcayne/master

Sync to my fork