First commit from admzus
Merge pull request #144 from admzus/master

First commit from admzus