dennisreimann Merge pull request #51 from mAlishera/master