Bugfix/225

@c00n84 Please check an merge