Initial code push v1.5.11
Fixed various bugs
Fixed various bugs #2