Gnopps Merge pull request #2 from bubonicfred/master