Changed version to 1.0.4 + bugfixes