Merge pull request #1 from maxtillich/master

Update
Working now.
Merge pull request #1 from lukashed/master

Working now