Merge pull request #7 from Sharlikran/master

Minor update to ChangeLog
Merge pull request #9 from Sharlikran/master

Updated container detection