Merge pull request #4 from ombozek/brozek

Merge Branch into Master
More tests implemented
fixed ugly syntax
merge master into brozek