Merge pull request #2 from mailmindlin/beta

Beta
Merge pull request #3 from mailmindlin/beta

Beta
Merge pull request #4 from mailmindlin/beta

Fixed syntax error
Merge pull request #5 from mailmindlin/master

Beta final