Merge pull request #714 from mcmonkey4eva/master

Pull request to close issues
Catch up.