some bug fixes and stuff

Signed-off-by: somatonic <philipp@urlich.ch>
Merge pull request #4 from somatonic/master

some bug fixes and stuff