Init commit
Merge http://github.com/marvin89/addictive