Merge pull request #4 from starverte/master

Merge from master