Version 1.0.4 Bugfix for non-critical features