Merge pull request #4 from mrwebapp/master

merge work from andi
Merge pull request #6 from greenore/master

Merge pull request #4 from mrwebapp/master