Update by Awesomez
Merge pull request #3 from NilsHoyer/master

update to new