Sixth commit
Merge pull request #2 from vhasus/new

Second PR including first unmerged changes