Merge pull request #1 from schmaedech/master

test bioscada
Update LICENSE
Merge pull request #4 from BioSCADA/master

updates