Merge pull request #1 from arcayne/master

Sync to my fork
Merge pull request #18 from ferrangomis/master

Merge pull request #1 from arcayne/master