Merge Developer Branch (b. jarosinski) with master