final commits
Merge pull request #76 from Galithil/master

final commits