From branch final
Merge pull request #3 from jandi02/final

From branch final