Final Version 1.5

Final commit of Version 1.5 with bug fixes.