merged
fixed conflicts
changed content
added content
Merge pull request #2 from leooob/master

Changed content as a requested from ARBDD.