Merge pull request #7 from elextro/master

Sync branches