This fixes #1 and #2

@krzyk240 I think this will make your project infinitely better.