Update 1.8.2014 1336

Updated branch with newest features from development0.04 and reran all tests. All tests are passing. This finalizes the current merge state.