prepared for namechange
Merge pull request #1 from stigdreyer/master

prepared for namechange + tested