Merge pull request #4 from mrwebapp/master

merge work from andi