Merge pull request #1 from mclinux/master

Merge acidental commit to master
Merge pull request #2 from mclinux/testing

Completing the merge to the acidental commit