Release build fixing Issue #29;