Merge pull request #14 from leozhad/master

Merge from master