Merge pull request #12 from sils1297/master

Bugfix
Remove __author__ assignments, add license header
Merge pull request #13 from sils1297/bug6

Bug6
Bugfix