Issue #687
Issue #688
Merge pull request #689 from D0rako/master

Issue #687 & #688 Fix