Merge with current Mr-Dave/master
It's time to deprecate old sackmotion's master branch in favor of Mr-Dave fork.