Merge pull request #9 from muxahuk/master

Marge