Make it really hard :)
Merge branch 'dev'
Added README