v1.3.5

Merged all features together and updated new bug fixes.