Merge pull request #4 from proller/master

some fixes
bugfix
better and faster