Merge pull request #3 from Tritlo/master

update
Merge pull request #4 from Tritlo/master

update
Merge pull request #5 from Tritlo/gh-pages

update